From b2f8dfb8b959c21c8d4e8b6a97bc8ce18f891cc4 Mon Sep 17 00:00:00 2001 From: ozelot379 Date: Fri, 6 Sep 2019 17:46:40 +0200 Subject: [PATCH 001/223] Feature scanIterator (#781) * Feature scanIterator * Redo `scan` uses scanIterator * Note scanIterator in README.md --- packages/core/src/index.js | 22 +++++++++++++++++++++- packages/jimp/README.md | 8 ++++++++ packages/jimp/jimp.d.ts | 6 ++++++ packages/jimp/test/scan.test.js | 25 +++++++++++++++++++++++++ packages/utils/README.md | 10 ++++++++++ packages/utils/src/index.js | 15 +++++++++++++++ 6 files changed, 85 insertions(+), 1 deletion(-) diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 7a8d6fed1..6e07836cc 100755 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -2,7 +2,7 @@ import fs from 'fs'; import Path from 'path'; import EventEmitter from 'events'; -import { isNodePattern, throwError, scan } from '@jimp/utils'; +import { isNodePattern, throwError, scan, scanIterator } from '@jimp/utils'; import anyBase from 'any-base'; import mkdirp from 'mkdirp'; import pixelMatch from 'pixelmatch'; @@ -811,6 +811,26 @@ class Jimp extends EventEmitter { return false; } + + /** + * Iterate scan through a region of the bitmap + * @param {number} x the x coordinate to begin the scan at + * @param {number} y the y coordinate to begin the scan at + * @param w the width of the scan region + * @param h the height of the scan region + * @returns {IterableIterator<{x: number, y: number, idx: number, image: Jimp}>} + */ + scanIterator(x, y, w, h) { + if (typeof x !== 'number' || typeof y !== 'number') { + return throwError.call(this, 'x and y must be numbers'); + } + + if (typeof w !== 'number' || typeof h !== 'number') { + return throwError.call(this, 'w and h must be numbers'); + } + + return scanIterator(this, x, y, w, h); + } } export function addConstants(constants, jimpInstance = Jimp) { diff --git a/packages/jimp/README.md b/packages/jimp/README.md index 520f50617..40ef8aec6 100644 --- a/packages/jimp/README.md +++ b/packages/jimp/README.md @@ -637,6 +637,14 @@ image.scan(0, 0, image.bitmap.width, image.bitmap.height, function(x, y, idx) { }); ``` +It's possible to make an iterator scan with a `for ... of`, if you want to `break` the scan before it reaches the end, but note, that this iterator has a huge performance implication: + +```js +for (const { x, y, idx, image } of image.scanIterator(0, 0, image.bitmap.width, image.bitmap.height)) { + +} +``` + A helper to locate a particular pixel within the raw bitmap buffer: ```js diff --git a/packages/jimp/jimp.d.ts b/packages/jimp/jimp.d.ts index 2ae0c15c4..8d4ab890d 100644 --- a/packages/jimp/jimp.d.ts +++ b/packages/jimp/jimp.d.ts @@ -177,6 +177,12 @@ export interface Jimp { f: (this: this, x: number, y: number, idx: number) => any, cb?: ImageCallback ): this; + scanIterator( + x: number, + y: number, + w: number, + h: number + ): IterableIterator<{x: number, y: number, idx: number, image: Jimp}>; crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): this; cropQuiet( x: number, diff --git a/packages/jimp/test/scan.test.js b/packages/jimp/test/scan.test.js index 259a1cfce..9a8ad574c 100644 --- a/packages/jimp/test/scan.test.js +++ b/packages/jimp/test/scan.test.js @@ -24,6 +24,31 @@ describe('Scan (pixel matrix modification)', () => { .should.be.sameJGD(barsJGD, 'Color bars'); }); + it('draw bars with iterate scan', async () => { + const image = await Jimp.create(8, 3); + + for (const { x, y, idx, image } of image.scanIterator( + 0, + 0, + image.bitmap.width, + image.bitmap.height + )) { + const color = [ + [0xff, 0x00, 0x00], + [0x00, 0xff, 0x00], + [0x00, 0x00, 0xff], + [0xff, 0xff, 0x00] + ][Math.floor(x / (image.bitmap.width / 4))]; + + image.bitmap.data[idx] = color[0]; + image.bitmap.data[idx + 1] = color[1]; + image.bitmap.data[idx + 2] = color[2]; + image.bitmap.data[idx + 3] = y === 2 ? 0x7f : 0xff; + } + + image.getJGDSync().should.be.sameJGD(barsJGD, 'Color bars'); + }); + it('draw bars with (get|set)PixelColor', async () => { const image = await Jimp.read(barsJGD); diff --git a/packages/utils/README.md b/packages/utils/README.md index c48b87f5c..01678e733 100644 --- a/packages/utils/README.md +++ b/packages/utils/README.md @@ -50,3 +50,13 @@ function removeRed(image) { }); } ``` + +### scanIterator + +It's possible to make an iterator scan with a `for ... of`, if you want to `break` the scan before it reaches the end, but note, that this iterator has a huge performance implication: + +```js +for (const { x, y, idx, image } of scanIterator(image, 0, 0, image.bitmap.width, image.bitmap.height)) { + +} +``` diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index 97708277d..8f51fd356 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -38,3 +38,18 @@ export function scan(image, x, y, w, h, f) { return image; } + +export function* scanIterator(image, x, y, w, h) { + // round input + x = Math.round(x); + y = Math.round(y); + w = Math.round(w); + h = Math.round(h); + + for (let _y = y; _y < y + h; _y++) { + for (let _x = x; _x < x + w; _x++) { + const idx = (image.bitmap.width * _y + _x) << 2; + yield { x: _x, y: _y, idx, image }; + } + } +} From 8b556993c0d3edb4a68222db18ed6ec612e72bbe Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 6 Sep 2019 15:52:58 +0000 Subject: [PATCH 002/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0944eed50..80629d682 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.7.0 (Fri Sep 06 2019) + +#### 🚀 Enhancement + +- `@jimp/core`, `jimp`, `@jimp/utils` + - Feature scanIterator [#781](https://github.com/oliver-moran/jimp/pull/781) ([@ozelot379](https://github.com/ozelot379)) + +#### Authors: 1 + +- [@ozelot379](https://github.com/ozelot379) + +--- + # v0.6.8 (Tue Sep 03 2019) #### 🐛 Bug Fix From cd5ff6a525c0e547fb0b8172a864d98c4ed7d5fd Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 6 Sep 2019 15:53:00 +0000 Subject: [PATCH 003/223] Bump version to: 0.7.0 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index 7214f810a..a4c5e3ed7 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.6.8" + "version": "0.7.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 699f5ccbd..2f41c33a2 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.6.8", + "version": "0.7.0", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.6.8", + "@jimp/custom": "^0.7.0", "chalk": "^2.4.1", - "jimp": "^0.6.8", + "jimp": "^0.7.0", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 0fb76f41d..d3cc39711 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.6.8", + "version": "0.7.0", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -32,7 +32,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index 77b6b04d4..35c71da55 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.6.8", + "version": "0.7.0", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.6.8", + "@jimp/core": "^0.7.0", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index a1ac55222..e304b8633 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.6.8", + "version": "0.7.0", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -51,14 +51,14 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/plugins": "^0.6.8", - "@jimp/types": "^0.6.8", + "@jimp/custom": "^0.7.0", + "@jimp/plugins": "^0.7.0", + "@jimp/types": "^0.7.0", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@jimp/test-utils": "^0.6.8", + "@jimp/test-utils": "^0.7.0", "babelify": "^10.0.0", "browserify": "^16.2.2", "envify": "^4.1.0", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index ef5292933..5a80262c3 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.6.8", + "version": "0.7.0", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,13 +19,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/jpeg": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/jpeg": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 9883ac52a..96ae5d7e8 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.6.8", + "version": "0.7.0", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 1384827b1..183737689 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.6.8", + "version": "0.7.0", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,15 +19,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 94d18f9da..2b1a4a45a 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.6.8", + "version": "0.7.0", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,14 +19,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8", - "@jimp/types": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0", + "@jimp/types": "^0.7.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index e204ac1b2..14f36694e 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.6.8", + "version": "0.7.0", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/plugin-blit": "^0.6.8", - "@jimp/plugin-resize": "^0.6.8", - "@jimp/plugin-scale": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/plugin-blit": "^0.7.0", + "@jimp/plugin-resize": "^0.7.0", + "@jimp/plugin-scale": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index c617a36b0..9c2de2c21 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.6.8", + "version": "0.7.0", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/plugin-crop": "^0.6.8", - "@jimp/plugin-resize": "^0.6.8", - "@jimp/plugin-scale": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/plugin-crop": "^0.7.0", + "@jimp/plugin-resize": "^0.7.0", + "@jimp/plugin-scale": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 656aaa4a9..dc81c80f5 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.6.8", + "version": "0.7.0", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,12 +19,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 293f45700..fd94bf729 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.6.8", + "version": "0.7.0", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 4f7f65ca2..51af633a8 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.6.8", + "version": "0.7.0", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 42e30949b..245d84639 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.6.8", + "version": "0.7.0", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,15 +19,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 1b0c3ca73..1d44ab03c 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.6.8", + "version": "0.7.0", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 2c7038b70..d8446961c 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.6.8", + "version": "0.7.0", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index e7bde274a..18c889ab2 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.6.8", + "version": "0.7.0", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index e74980127..e5b1f942d 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.6.8", + "version": "0.7.0", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,15 +19,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 487362f59..0c6c7a625 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.6.8", + "version": "0.7.0", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,15 +19,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 344775efa..e0df6bbce 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.6.8", + "version": "0.7.0", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -28,9 +28,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/plugin-blit": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/plugin-blit": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 6df8ee060..dcb7281b2 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.6.8", + "version": "0.7.0", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,15 +19,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 4df05af3c..51df16b47 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.6.8", + "version": "0.7.0", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/plugin-blit": "^0.6.8", - "@jimp/plugin-crop": "^0.6.8", - "@jimp/plugin-resize": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/plugin-blit": "^0.7.0", + "@jimp/plugin-crop": "^0.7.0", + "@jimp/plugin-resize": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 278813a26..fb63d6f71 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.6.8", + "version": "0.7.0", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 8e8ce9738..b72822fac 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.6.8", + "version": "0.7.0", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -28,10 +28,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/plugin-blur": "^0.6.8", - "@jimp/plugin-resize": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/plugin-blur": "^0.7.0", + "@jimp/plugin-resize": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index ab758e6aa..250aefd98 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.6.8", + "version": "0.7.0", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -28,11 +28,11 @@ "@jimp/plugin-resize": "^0.6.3" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/jpeg": "^0.6.8", - "@jimp/plugin-color": "^0.6.8", - "@jimp/plugin-resize": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/jpeg": "^0.7.0", + "@jimp/plugin-color": "^0.7.0", + "@jimp/plugin-resize": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 259d71265..dfec8a65f 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -16,23 +16,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.6.8", - "@jimp/plugin-blur": "^0.6.8", - "@jimp/plugin-color": "^0.6.8", - "@jimp/plugin-contain": "^0.6.8", - "@jimp/plugin-cover": "^0.6.8", - "@jimp/plugin-crop": "^0.6.8", - "@jimp/plugin-displace": "^0.6.8", - "@jimp/plugin-dither": "^0.6.8", - "@jimp/plugin-flip": "^0.6.8", - "@jimp/plugin-gaussian": "^0.6.8", - "@jimp/plugin-invert": "^0.6.8", - "@jimp/plugin-mask": "^0.6.8", - "@jimp/plugin-normalize": "^0.6.8", - "@jimp/plugin-print": "^0.6.8", - "@jimp/plugin-resize": "^0.6.8", - "@jimp/plugin-rotate": "^0.6.8", - "@jimp/plugin-scale": "^0.6.8", + "@jimp/plugin-blit": "^0.7.0", + "@jimp/plugin-blur": "^0.7.0", + "@jimp/plugin-color": "^0.7.0", + "@jimp/plugin-contain": "^0.7.0", + "@jimp/plugin-cover": "^0.7.0", + "@jimp/plugin-crop": "^0.7.0", + "@jimp/plugin-displace": "^0.7.0", + "@jimp/plugin-dither": "^0.7.0", + "@jimp/plugin-flip": "^0.7.0", + "@jimp/plugin-gaussian": "^0.7.0", + "@jimp/plugin-invert": "^0.7.0", + "@jimp/plugin-mask": "^0.7.0", + "@jimp/plugin-normalize": "^0.7.0", + "@jimp/plugin-print": "^0.7.0", + "@jimp/plugin-resize": "^0.7.0", + "@jimp/plugin-rotate": "^0.7.0", + "@jimp/plugin-scale": "^0.7.0", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index c9fd76ac9..ba2176a54 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.6.8", + "version": "0.7.0", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.6.8", + "@jimp/custom": "^0.7.0", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index a21d606f0..3059ea590 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 5c23f632e..01149f39d 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -16,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 477a3cdd7..34ee5101d 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 8125e5bc0..6b8877e3e 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.6.8", + "@jimp/utils": "^0.7.0", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index c74a94380..b52eafd2b 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.6.8", - "@jimp/test-utils": "^0.6.8" + "@jimp/custom": "^0.7.0", + "@jimp/test-utils": "^0.7.0" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index 5455beb58..20a3d2c68 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.6.8", + "version": "0.7.0", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -16,11 +16,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.6.8", - "@jimp/gif": "^0.6.8", - "@jimp/jpeg": "^0.6.8", - "@jimp/png": "^0.6.8", - "@jimp/tiff": "^0.6.8", + "@jimp/bmp": "^0.7.0", + "@jimp/gif": "^0.7.0", + "@jimp/jpeg": "^0.7.0", + "@jimp/png": "^0.7.0", + "@jimp/tiff": "^0.7.0", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 514b8595c..cf3330e82 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.6.8", + "version": "0.7.0", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From c1a59d69889130ea7bfaba3d9c4aac69a2251cfa Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Sat, 7 Sep 2019 10:14:19 -0700 Subject: [PATCH 004/223] Made typings plugin friendly & add typings for every package (#770) * Initial and likely incorrect typings of types pkgs * Consolidate types pkgs to central typing This central typing may likely be incorrect and need further revisions I am making so many commits to ensure I (and others) can track my progress as I figure out the type system for jimp * Make generic plugin type, type out utils file * Migrate to existing typings in `jimp` package * Added core package typings * Added typings to custom package based on README * WIP break out def files to their respective pkgs * Further work to break out pkg TS defs * Added missing cb optional types * Added typing for plugin threshold * Made the type typings consistent with plugin API * Move font specific typings to plugin print * Fixed core typing for @jimp/core, started making typings proper * Fix typing for type-bmp * Further work to standardize plugins * Make initial changes in type typings * Making typing stylings more consistent * WIP on making jimp package itself use the new plugin system * Made plugin and configure typings more strict and accurate * Fix typings for plugins in Jimp type * Remove the `/src` append added to assist debug * Add changes to typings back after rebase * Fix typing infrastructure, fix configure typing Move typing files to proper locations, included typing file in package.json files, fix the configure function typings --- CHANGELOG.md | 20 +- packages/core/index.d.ts | 335 ++++++++++++++++ packages/core/package.json | 3 +- packages/custom/README.md | 4 +- packages/custom/index.d.ts | 14 + packages/custom/package.json | 1 + packages/jimp/README.md | 24 +- packages/jimp/index.d.ts | 27 ++ packages/jimp/jimp.d.ts | 535 ------------------------- packages/jimp/package.json | 4 +- packages/plugin-blit/index.d.ts | 17 + packages/plugin-blit/package.json | 1 + packages/plugin-blur/index.d.ts | 7 + packages/plugin-blur/package.json | 1 + packages/plugin-circle/index.d.ts | 12 + packages/plugin-circle/package.json | 1 + packages/plugin-color/index.d.ts | 56 +++ packages/plugin-color/package.json | 1 + packages/plugin-contain/index.d.ts | 16 + packages/plugin-contain/package.json | 1 + packages/plugin-cover/index.d.ts | 15 + packages/plugin-cover/package.json | 1 + packages/plugin-crop/index.d.ts | 33 ++ packages/plugin-crop/package.json | 1 + packages/plugin-crop/test/crop.test.js | 63 +-- packages/plugin-displace/index.d.ts | 7 + packages/plugin-displace/package.json | 1 + packages/plugin-dither/index.d.ts | 8 + packages/plugin-dither/package.json | 1 + packages/plugin-fisheye/index.d.ts | 8 + packages/plugin-fisheye/package.json | 1 + packages/plugin-flip/index.d.ts | 8 + packages/plugin-flip/package.json | 1 + packages/plugin-gaussian/index.d.ts | 7 + packages/plugin-gaussian/package.json | 1 + packages/plugin-invert/index.d.ts | 7 + packages/plugin-invert/package.json | 1 + packages/plugin-mask/index.d.ts | 7 + packages/plugin-mask/package.json | 1 + packages/plugin-normalize/index.d.ts | 7 + packages/plugin-normalize/package.json | 1 + packages/plugin-print/index.d.ts | 119 ++++++ packages/plugin-print/package.json | 1 + packages/plugin-resize/index.d.ts | 19 + packages/plugin-resize/package.json | 1 + packages/plugin-rotate/index.d.ts | 8 + packages/plugin-rotate/package.json | 1 + packages/plugin-scale/index.d.ts | 10 + packages/plugin-scale/package.json | 1 + packages/plugin-shadow/index.d.ts | 14 + packages/plugin-shadow/package.json | 1 + packages/plugin-threshold/index.d.ts | 11 + packages/plugin-threshold/package.json | 1 + packages/plugins/index.d.ts | 63 +++ packages/plugins/package.json | 1 + packages/type-bmp/index.d.ts | 24 ++ packages/type-bmp/package.json | 1 + packages/type-gif/index.d.ts | 17 + packages/type-gif/package.json | 1 + packages/type-jpeg/index.d.ts | 25 ++ packages/type-jpeg/package.json | 1 + packages/type-png/index.d.ts | 38 ++ packages/type-png/package.json | 1 + packages/type-tiff/index.d.ts | 16 + packages/type-tiff/package.json | 1 + packages/types/index.d.ts | 27 ++ packages/types/package.json | 4 + packages/utils/README.md | 9 +- packages/utils/index.d.ts | 9 + packages/utils/package.json | 1 + yarn.lock | 5 + 71 files changed, 1075 insertions(+), 616 deletions(-) create mode 100644 packages/core/index.d.ts create mode 100644 packages/custom/index.d.ts create mode 100644 packages/jimp/index.d.ts delete mode 100644 packages/jimp/jimp.d.ts create mode 100644 packages/plugin-blit/index.d.ts create mode 100644 packages/plugin-blur/index.d.ts create mode 100644 packages/plugin-circle/index.d.ts create mode 100644 packages/plugin-color/index.d.ts create mode 100644 packages/plugin-contain/index.d.ts create mode 100644 packages/plugin-cover/index.d.ts create mode 100644 packages/plugin-crop/index.d.ts create mode 100644 packages/plugin-displace/index.d.ts create mode 100644 packages/plugin-dither/index.d.ts create mode 100644 packages/plugin-fisheye/index.d.ts create mode 100644 packages/plugin-flip/index.d.ts create mode 100644 packages/plugin-gaussian/index.d.ts create mode 100644 packages/plugin-invert/index.d.ts create mode 100644 packages/plugin-mask/index.d.ts create mode 100644 packages/plugin-normalize/index.d.ts create mode 100644 packages/plugin-print/index.d.ts create mode 100644 packages/plugin-resize/index.d.ts create mode 100644 packages/plugin-rotate/index.d.ts create mode 100644 packages/plugin-scale/index.d.ts create mode 100644 packages/plugin-shadow/index.d.ts create mode 100644 packages/plugin-threshold/index.d.ts create mode 100644 packages/plugins/index.d.ts create mode 100644 packages/type-bmp/index.d.ts create mode 100644 packages/type-gif/index.d.ts create mode 100644 packages/type-jpeg/index.d.ts create mode 100644 packages/type-png/index.d.ts create mode 100644 packages/type-tiff/index.d.ts create mode 100644 packages/types/index.d.ts create mode 100644 packages/utils/index.d.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 80629d682..e4aa48035 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # v0.7.0 (Fri Sep 06 2019) -#### 🚀 Enhancement +#### 🚀 Enhancement - `@jimp/core`, `jimp`, `@jimp/utils` - Feature scanIterator [#781](https://github.com/oliver-moran/jimp/pull/781) ([@ozelot379](https://github.com/ozelot379)) @@ -13,7 +13,7 @@ # v0.6.8 (Tue Sep 03 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `jimp` - Remove dependency '@babel/polyfill' and add 'regenerator-runtime' [#783](https://github.com/oliver-moran/jimp/pull/783) ([@ebual](https://github.com/ebual) [@hipstersmoothie](https://github.com/hipstersmoothie)) @@ -27,7 +27,7 @@ # v0.6.7 (Tue Sep 03 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/plugin-crop` - Plugin crop/fix safety checks [#743](https://github.com/oliver-moran/jimp/pull/743) ([@jagaSto](https://github.com/jagaSto)) @@ -40,7 +40,7 @@ # v0.6.6 (Tue Sep 03 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/plugin-crop` - Fix cropping full width slices [#741](https://github.com/oliver-moran/jimp/pull/741) ([@NiGhTTraX](https://github.com/NiGhTTraX)) @@ -53,7 +53,7 @@ # v0.6.5 (Tue Sep 03 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/cli`, `jimp` - Fix types [#778](https://github.com/oliver-moran/jimp/pull/778) ([@hipstersmoothie](https://github.com/hipstersmoothie)) @@ -64,13 +64,13 @@ - `jimp` - export more interfaces [#732](https://github.com/oliver-moran/jimp/pull/732) ([@pvolyntsev](https://github.com/pvolyntsev)) -#### 🏠 Internal +#### 🏠 Internal - Add Automated Releases [#784](https://github.com/oliver-moran/jimp/pull/784) ([@hipstersmoothie](https://github.com/hipstersmoothie)) - `@jimp/cli`, `@jimp/core`, `jimp`, `@jimp/plugin-crop`, `@jimp/plugin-rotate` - [WIP] circle ci time! [#777](https://github.com/oliver-moran/jimp/pull/777) ([@hipstersmoothie](https://github.com/hipstersmoothie)) -#### 📝 Documentation +#### 📝 Documentation - Replace `npm` usage with `yarn` [#782](https://github.com/oliver-moran/jimp/pull/782) ([@pvolyntsev](https://github.com/pvolyntsev)) - Add Nimp to readme.md. [#766](https://github.com/oliver-moran/jimp/pull/766) ([@pvolyntsev](https://github.com/pvolyntsev)) @@ -81,9 +81,9 @@ - `@jimp/plugin-gaussian` - fix gaussian example [#767](https://github.com/oliver-moran/jimp/pull/767) ([@Armanio](https://github.com/Armanio)) -#### ⚠️ Pushed to master +#### ⚠️ Pushed to master -- trust github.com ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- trust github.com ([@hipstersmoothie](https://github.com/hipstersmoothie)) #### Authors: 6 @@ -92,4 +92,4 @@ - Shen Yiming ([@soimy](https://github.com/soimy)) - Rob Moore ([@robert-moore](https://github.com/robert-moore)) - Ahmad Awais ⚡️ ([@ahmadawais](https://github.com/ahmadawais)) -- Arman ([@Armanio](https://github.com/Armanio)) \ No newline at end of file +- Arman ([@Armanio](https://github.com/Armanio)) diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts new file mode 100644 index 000000000..2b9148248 --- /dev/null +++ b/packages/core/index.d.ts @@ -0,0 +1,335 @@ +export function addConstants(constants: [string, string | number], jimpInstance?: Jimp): void; +export function addJimpMethods(methods: [string, Function], jimpInstance?: Jimp): void; +export function jimpEvMethod(methodName: string, evName: string, method: Function): void; +export function jimpEvChange(methodName: string, method: Function): void; +export function addType(mime: string, extensions: string[]): void; + +interface BaseJimp { + prototype: Jimp; + // Constants + AUTO: -1; + // blend modes + BLEND_SOURCE_OVER: string; + BLEND_DESTINATION_OVER: string; + BLEND_MULTIPLY: string; + BLEND_SCREEN: string; + BLEND_OVERLAY: string; + BLEND_DARKEN: string; + BLEND_LIGHTEN: string; + BLEND_HARDLIGHT: string; + BLEND_DIFFERENCE: string; + BLEND_EXCLUSION: string; + // Align modes for cover, contain, bit masks + HORIZONTAL_ALIGN_LEFT: 1; + HORIZONTAL_ALIGN_CENTER: 2; + HORIZONTAL_ALIGN_RIGHT: 4; + VERTICAL_ALIGN_TOP: 8; + VERTICAL_ALIGN_MIDDLE: 16; + VERTICAL_ALIGN_BOTTOM: 32; + // Edge Handling + EDGE_EXTEND: 1; + EDGE_WRAP: 2; + EDGE_CROP: 3; + // Properties + bitmap: Bitmap; + _quality: number; + _deflateLevel: number; + _deflateStrategy: number; + _filterType: number; + _rgba: boolean; + _background: number; + _originalMime: string; + // Constructors + new(path: string, cb?: ImageCallback): Jimp; + new(urlOptions: URLOptions, cb?: ImageCallback): Jimp; + new(image: Jimp, cb?: ImageCallback): Jimp; + new(data: Buffer, cb?: ImageCallback): Jimp; + new(data: Bitmap, cb?: ImageCallback): Jimp; + new(w: number, h: number, cb?: ImageCallback): Jimp; + new( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ): Jimp; + // For custom constructors when using Jimp.appendConstructorOption + new(...args: any[]): Jimp; + // Methods + on( + event: T, + cb: (data: ListenerData) => any + ): any; + parseBitmap( + data: Buffer, + path: string | null | undefined, + cb?: ImageCallback + ): void; + hasAlpha(): boolean; + getHeight(): number; + getWidth(): number; + inspect(): string; + toString(): string; + getMIME(): string; + getExtension(): string; + distanceFromHash(hash: string): number; + write(path: string, cb?: ImageCallback): this; + writeAsync(path: string): Promise; + deflateLevel(l: number, cb?: ImageCallback): this; + deflateStrategy(s: number, cb?: ImageCallback): this; + colorType(s: number, cb?: ImageCallback): this; + filterType(f: number, cb?: ImageCallback): this; + rgba(bool: boolean, cb?: ImageCallback): this; + quality(n: number, cb?: ImageCallback): this; + getBase64(mime: string, cb: GenericCallback): this; + getBase64Async(mime: string): Promise; + hash(cb?: GenericCallback): string; + hash( + base: number | null | undefined, + cb?: GenericCallback + ): string; + getBuffer(mime: string, cb: GenericCallback): this; + getBufferAsync(mime: string): Promise; + getPixelIndex( + x: number, + y: number, + cb?: GenericCallback + ): number; + getPixelIndex( + x: number, + y: number, + edgeHandling: string, + cb?: GenericCallback + ): number; + getPixelColor( + x: number, + y: number, + cb?: GenericCallback + ): number; + getPixelColour( + x: number, + y: number, + cb?: GenericCallback + ): number; + setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; + setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; + clone(cb?: ImageCallback): this; + cloneQuiet(cb?: ImageCallback): this; + background(hex: number, cb?: ImageCallback): this; + backgroundQuiet(hex: number, cb?: ImageCallback): this; + scan( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: ImageCallback + ): this; + scanQuiet( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: ImageCallback + ): this; + scanIterator( + x: number, + y: number, + w: number, + h: number + ): IterableIterator<{x: number, y: number, idx: number, image: Jimp}>; + + // Effect methods + composite( + src: Jimp, + x: number, + y: number, + options?: BlendMode, + cb?: ImageCallback + ): this; + + // Functions + appendConstructorOption( + name: string, + test: (...args: T[]) => boolean, + run: ( + this: Jimp, + resolve: (jimp: Jimp) => any, + reject: (reason: Error) => any, + ...args: T[] + ) => any + ): void; + read(path: string): Promise; + read(image: Jimp): Promise; + read(data: Buffer): Promise; + read(w: number, h: number, background?: number | string): Promise; + create(path: string): Promise; + create(image: Jimp): Promise; + create(data: Buffer): Promise; + create(w: number, h: number, background?: number | string): Promise; + rgbaToInt( + r: number, + g: number, + b: number, + a: number, + cb: GenericCallback + ): number; + intToRGBA(i: number, cb?: GenericCallback): RGBA; + cssColorToHex(cssColor: string): number; + limit255(n: number): number; + diff( + img1: Jimp, + img2: Jimp, + threshold?: number + ): { + percent: number; + image: Jimp; + }; + distance(img1: Jimp, img2: Jimp): number; + compareHashes(hash1: string, hash2: string): number; + colorDiff(rgba1: RGB, rgba2: RGB): number; + colorDiff(rgba1: RGBA, rgba2: RGBA): number; +} + +export interface Image { + bitmap: Bitmap; +} + +// This must be exported to fix the "index signature missing" error +export interface IllformedPlugin { + class?: never; + constants?: never; + [classFunc: string]: Function +} + +export type DecoderFn = (data: Buffer) => Bitmap +export type EncoderFn = (image: ImageType) => Buffer + +interface WellFormedPlugin { + mime?: { + [MIME_TYPE: string]: string[]; + }; + hasAlpha?: { + [MIME_SPECIAL: string]: boolean; + }; + constants?: { + // Contants to assign to the Jimp instance + [MIME_SPECIAL: string]: any; + }; + decoders?: { + [MIME_TYPE: string]: DecoderFn; + }; + encoders?: { + // Jimp Image + [MIME_TYPE: string]: EncoderFn; + }; + // Extend the Jimp class with the following constants, etc + class?: any; +} + +type ClassOrConstantPlugin = WellFormedPlugin & ( + Required, 'class'>> | Required, 'constants'>> + ); + +// A Jimp type requires mime, but not class +export type JimpType = WellFormedPlugin & Required, 'mime'>>; + +// Jimp plugin either MUST have class OR constant or be illformed +export type JimpPlugin = ClassOrConstantPlugin | IllformedPlugin; + +export type PluginFunction = () => JimpPlugin; +export type TypeFunction = () => JimpType; + +// This is required as providing type arrays gives a union of all the generic +// types in the array rather than an intersection +type UnionToIntersection = + (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never + +// The values to be extracted from a WellFormedPlugin to put onto the Jimp instance +type WellFormedValues = T['class'] & T['constants']; + +// Jimp generic to be able to put plugins and types into, thus allowing +// `configure` from `@jimp/custom` to have proper typings +export type Jimp = + BaseJimp + & UnionToIntersection> + & UnionToIntersection<(P extends WellFormedPlugin ? WellFormedValues

: P)> + +export type GenericCallback = ( + this: TThis, + err: Error | null, + value: T +) => U; + +export type ImageCallback = ( + this: Jimp, + err: Error | null, + value: Jimp, + coords: { + x: number; + y: number; + } +) => U; + +type BlendMode = { + mode: string; + opacitySource: number; + opacityDest: number; +}; + +type ChangeName = 'background' | 'scan' | 'crop'; + +type ListenableName = + | 'any' + | 'initialized' + | 'before-change' + | 'changed' + | 'before-clone' + | 'cloned' + | ChangeName; + +type ListenerData = T extends 'any' + ? any + : T extends ChangeName + ? { + eventName: 'before-change' | 'changed'; + methodName: T; + [key: string]: any; + } + : { + eventName: T; + methodName: T extends 'initialized' + ? 'constructor' + : T extends 'before-change' | 'changed' + ? ChangeName + : T extends 'before-clone' | 'cloned' ? 'clone' : any; + }; + +type URLOptions = { + url: string; + compression?: boolean; + headers: { + [key: string]: any; + }; +}; + +export interface Bitmap { + data: Buffer; + width: number; + height: number; +} + +export interface RGB { + r: number; + g: number; + b: number; +} + +export interface RGBA { + r: number; + g: number; + b: number; + a: number; +} + +export default Jimp; diff --git a/packages/core/package.json b/packages/core/package.json index d3cc39711..f526587b7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -4,10 +4,11 @@ "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "files": [ "dist", "es", - "jimp.d.ts", + "index.d.ts", "fonts" ], "repository": { diff --git a/packages/custom/README.md b/packages/custom/README.md index a083c37ee..e7892bb6a 100644 --- a/packages/custom/README.md +++ b/packages/custom/README.md @@ -69,7 +69,7 @@ jimp = configure( To define a new Jimp image type write a function the takes the current Jimp configuration. In this function you can extend Jimp's internal data structures. -This function must return and array whose first element is the mime type and second element is an array of valid file extensions. +This function must return an object whose key is the mime type and value is an array of valid file extensions. ```js const special = require('special-js'); @@ -77,7 +77,7 @@ const special = require('special-js'); const MIME_TYPE = 'image/special'; export default () => ({ - mime: [MIME_TYPE, ['spec', 'special']], + mime: {[MIME_TYPE], ['spec', 'special']}, constants: { MIME_SPECIAL: MIME_TYPE diff --git a/packages/custom/index.d.ts b/packages/custom/index.d.ts new file mode 100644 index 000000000..2413bb64a --- /dev/null +++ b/packages/custom/index.d.ts @@ -0,0 +1,14 @@ +import { + Jimp, + JimpPlugin, + JimpType, + TypeFunction, + PluginFunction +} from '@jimp/core'; + +export default function configure(configuration: { + types?: TypeFunction[], + plugins?: PluginFunction[] +}, jimpInstance?: JimpInst): JimpInst & Jimp; diff --git a/packages/custom/package.json b/packages/custom/package.json index 35c71da55..c68e9e0cc 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -4,6 +4,7 @@ "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/jimp/README.md b/packages/jimp/README.md index 40ef8aec6..509f104ed 100644 --- a/packages/jimp/README.md +++ b/packages/jimp/README.md @@ -318,14 +318,14 @@ Jimp.VERTICAL_ALIGN_BOTTOM; Where the align mode changes the position of the associated axis as described in the table below. -Align Mode | Axis Point ---- | --- -`Jimp.HORIZONTAL_ALIGN_LEFT` | Positions the x-axis at the left of the image -`Jimp.HORIZONTAL_ALIGN_CENTER` | Positions the x-axis at the center of the image -`Jimp.HORIZONTAL_ALIGN_RIGHT` | Positions the x-axis at the right of the image -`Jimp.VERTICAL_ALIGN_TOP` | Positions the y-axis at the top of the image -`Jimp.VERTICAL_ALIGN_MIDDLE` | Positions the y-axis at the center of the image -`Jimp.VERTICAL_ALIGN_BOTTOM` | Positions the y-axis at the bottom of the image +| Align Mode | Axis Point | +| ------------------------------ | ----------------------------------------------- | +| `Jimp.HORIZONTAL_ALIGN_LEFT` | Positions the x-axis at the left of the image | +| `Jimp.HORIZONTAL_ALIGN_CENTER` | Positions the x-axis at the center of the image | +| `Jimp.HORIZONTAL_ALIGN_RIGHT` | Positions the x-axis at the right of the image | +| `Jimp.VERTICAL_ALIGN_TOP` | Positions the y-axis at the top of the image | +| `Jimp.VERTICAL_ALIGN_MIDDLE` | Positions the y-axis at the center of the image | +| `Jimp.VERTICAL_ALIGN_BOTTOM` | Positions the y-axis at the bottom of the image | For example: @@ -640,8 +640,12 @@ image.scan(0, 0, image.bitmap.width, image.bitmap.height, function(x, y, idx) { It's possible to make an iterator scan with a `for ... of`, if you want to `break` the scan before it reaches the end, but note, that this iterator has a huge performance implication: ```js -for (const { x, y, idx, image } of image.scanIterator(0, 0, image.bitmap.width, image.bitmap.height)) { - +for (const { x, y, idx, image } of image.scanIterator( + 0, + 0, + image.bitmap.width, + image.bitmap.height +)) { } ``` diff --git a/packages/jimp/index.d.ts b/packages/jimp/index.d.ts new file mode 100644 index 000000000..6256448a8 --- /dev/null +++ b/packages/jimp/index.d.ts @@ -0,0 +1,27 @@ +import { + Jimp as JimpType, + Bitmap, + RGB, + RGBA +} from '@jimp/core'; +import typeFn from '@jimp/types'; +import pluginFn from '@jimp/plugins'; + +type Types = ReturnType; +type Plugins = ReturnType; + +declare const Jimp: JimpType; +export default Jimp; + +export { + Bitmap, + RGB, + RGBA +} + +export { + FontChar, + FontInfo, + FontCommon, + Font +} from '@jimp/plugin-print'; diff --git a/packages/jimp/jimp.d.ts b/packages/jimp/jimp.d.ts deleted file mode 100644 index 8d4ab890d..000000000 --- a/packages/jimp/jimp.d.ts +++ /dev/null @@ -1,535 +0,0 @@ -declare const Jimp: Jimp; - -export default Jimp; - -export interface Jimp { - // Constructors - new (path: string, cb?: ImageCallback): Jimp; - new (urlOptions: URLOptions, cb?: ImageCallback): Jimp; - new (image: Jimp, cb?: ImageCallback): Jimp; - new (data: Buffer, cb?: ImageCallback): Jimp; - new (data: Bitmap, cb?: ImageCallback): Jimp; - new (w: number, h: number, cb?: ImageCallback): Jimp; - new ( - w: number, - h: number, - background?: number | string, - cb?: ImageCallback - ): Jimp; - // For custom constructors when using Jimp.appendConstructorOption - new (...args: any[]): Jimp; - prototype: Jimp; - - // Constants - AUTO: -1; - - // supported mime types - MIME_PNG: 'image/png'; - MIME_TIFF: 'image/tiff'; - MIME_JPEG: 'image/jpeg'; - MIME_JGD: 'image/jgd'; - MIME_BMP: 'image/bmp'; - MIME_X_MS_BMP: 'image/x-ms-bmp'; - MIME_GIF: 'image/gif'; - // PNG filter types - PNG_FILTER_AUTO: -1; - PNG_FILTER_NONE: 0; - PNG_FILTER_SUB: 1; - PNG_FILTER_UP: 2; - PNG_FILTER_AVERAGE: 3; - PNG_FILTER_PATH: 4; - - // resize methods - RESIZE_NEAREST_NEIGHBOR: 'nearestNeighbor'; - RESIZE_BILINEAR: 'bilinearInterpolation'; - RESIZE_BICUBIC: 'bicubicInterpolation'; - RESIZE_HERMITE: 'hermiteInterpolation'; - RESIZE_BEZIER: 'bezierInterpolation'; - - // blend modes - BLEND_SOURCE_OVER: string; - BLEND_DESTINATION_OVER: string; - BLEND_MULTIPLY: string; - BLEND_SCREEN: string; - BLEND_OVERLAY: string; - BLEND_DARKEN: string; - BLEND_LIGHTEN: string; - BLEND_HARDLIGHT: string; - BLEND_DIFFERENCE: string; - BLEND_EXCLUSION: string; - - // Align modes for cover, contain, bit masks - HORIZONTAL_ALIGN_LEFT: 1; - HORIZONTAL_ALIGN_CENTER: 2; - HORIZONTAL_ALIGN_RIGHT: 4; - - VERTICAL_ALIGN_TOP: 8; - VERTICAL_ALIGN_MIDDLE: 16; - VERTICAL_ALIGN_BOTTOM: 32; - - // Font locations - FONT_SANS_8_BLACK: string; - FONT_SANS_10_BLACK: string; - FONT_SANS_12_BLACK: string; - FONT_SANS_14_BLACK: string; - FONT_SANS_16_BLACK: string; - FONT_SANS_32_BLACK: string; - FONT_SANS_64_BLACK: string; - FONT_SANS_128_BLACK: string; - - FONT_SANS_8_WHITE: string; - FONT_SANS_16_WHITE: string; - FONT_SANS_32_WHITE: string; - FONT_SANS_64_WHITE: string; - FONT_SANS_128_WHITE: string; - - // Edge Handling - EDGE_EXTEND: 1; - EDGE_WRAP: 2; - EDGE_CROP: 3; - - // Properties - bitmap: Bitmap; - - _quality: number; - _deflateLevel: number; - _deflateStrategy: number; - _filterType: number; - _rgba: boolean; - _background: number; - _originalMime: string; - - // Methods - on( - event: T, - cb: (data: ListenerData) => any - ): any; - parseBitmap( - data: Buffer, - path: string | null | undefined, - cb?: ImageCallback - ): void; - hasAlpha(): boolean; - getHeight(): number; - getWidth(): number; - inspect(): string; - toString(): string; - getMIME(): string; - getExtension(): string; - distanceFromHash(hash: string): number; - write(path: string, cb?: ImageCallback): this; - writeAsync(path: string): Promise; - deflateLevel(l: number, cb?: ImageCallback): this; - deflateStrategy(s: number, cb?: ImageCallback): this; - colorType(s: number, cb?: ImageCallback): this; - filterType(f: number, cb?: ImageCallback): this; - rgba(bool: boolean, cb?: ImageCallback): this; - quality(n: number, cb?: ImageCallback): this; - getBase64(mime: string, cb: GenericCallback): this; - getBase64Async(mime: string): Promise; - hash(cb?: GenericCallback): string; - hash( - base: number | null | undefined, - cb?: GenericCallback - ): string; - getBuffer(mime: string, cb: GenericCallback): this; - getBufferAsync(mime: string): Promise; - getPixelIndex( - x: number, - y: number, - cb?: GenericCallback - ): number; - getPixelIndex( - x: number, - y: number, - edgeHandling: string, - cb?: GenericCallback - ): number; - getPixelColor( - x: number, - y: number, - cb?: GenericCallback - ): number; - getPixelColour( - x: number, - y: number, - cb?: GenericCallback - ): number; - setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; - setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; - clone(cb?: ImageCallback): this; - cloneQuiet(cb?: ImageCallback): this; - background(hex: number, cb?: ImageCallback): this; - backgroundQuiet(hex: number, cb?: ImageCallback): this; - scan( - x: number, - y: number, - w: number, - h: number, - f: (this: this, x: number, y: number, idx: number) => any, - cb?: ImageCallback - ): this; - scanQuiet( - x: number, - y: number, - w: number, - h: number, - f: (this: this, x: number, y: number, idx: number) => any, - cb?: ImageCallback - ): this; - scanIterator( - x: number, - y: number, - w: number, - h: number - ): IterableIterator<{x: number, y: number, idx: number, image: Jimp}>; - crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): this; - cropQuiet( - x: number, - y: number, - w: number, - h: number, - cb?: ImageCallback - ): this; - - // Color methods - brightness(val: number, cb?: ImageCallback): this; - contrast(val: number, cb?: ImageCallback): this; - posterize(n: number, cb?: ImageCallback): this; - greyscale(cb?: ImageCallback): this; - grayscale(cb?: ImageCallback): this; - opacity(f: number, cb?: ImageCallback): this; - sepia(cb?: ImageCallback): this; - fade(f: number, cb?: ImageCallback): this; - convolution(kernel: number[][], cb?: ImageCallback): this; - convolution( - kernel: number[][], - edgeHandling: string, - cb?: ImageCallback - ): this; - opaque(cb?: ImageCallback): this; - pixelate(size: number, cb?: ImageCallback): this; - pixelate( - size: number, - x: number, - y: number, - w: number, - h: number, - cb?: ImageCallback - ): this; - convolute(kernel: number[][], cb?: ImageCallback): this; - convolute( - kernel: number[][], - x: number, - y: number, - w: number, - h: number, - cb?: ImageCallback - ): this; - color(actions: ColorAction[], cb?: ImageCallback): this; - colour(actions: ColorAction[], cb?: ImageCallback): this; - - // Shape methods - rotate(deg: number, cb?: ImageCallback): this; - rotate(deg: number, mode: string | boolean, cb?: ImageCallback): this; - flip(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; - mirror(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; - resize(w: number, h: number, cb?: ImageCallback): this; - resize(w: number, h: number, mode?: string, cb?: ImageCallback): this; - cover(w: number, h: number, cb?: ImageCallback): this; - cover(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; - cover( - w: number, - h: number, - alignBits?: number, - mode?: string, - cb?: ImageCallback - ): this; - contain(w: number, h: number, cb?: ImageCallback): this; - contain(w: number, h: number, mode?: string, cb?: ImageCallback): this; - contain(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; - contain( - w: number, - h: number, - alignBits?: number, - mode?: string, - cb?: ImageCallback - ): this; - scale(f: number, cb?: ImageCallback): this; - scale(f: number, mode?: string, cb?: ImageCallback): this; - scaleToFit(w: number, h: number, cb?: ImageCallback): this; - scaleToFit(w: number, h: number, mode?: string, cb?: ImageCallback): this; - displace(map: Jimp, offset: number, cb?: ImageCallback): this; - autocrop(tolerance?: number, cb?: ImageCallback): this; - autocrop(cropOnlyFrames?: boolean, cb?: ImageCallback): this; - autocrop( - tolerance?: number, - cropOnlyFrames?: boolean, - cb?: ImageCallback - ): this; - autocrop( - options: { - tolerance?: number; - cropOnlyFrames?: boolean; - cropSymmetric?: boolean; - leaveBorder?: number; - }, - cb?: ImageCallback - ): this; - - // Text methods - print( - font: Font, - x: number, - y: number, - text: PrintableText, - cb?: ImageCallback - ): this; - print( - font: Font, - x: number, - y: number, - text: PrintableText, - maxWidth?: number, - cb?: ImageCallback - ): this; - print( - font: Font, - x: number, - y: number, - text: PrintableText, - maxWidth?: number, - maxHeight?: number, - cb?: ImageCallback - ): this; - - // Effect methods - blur(r: number, cb?: ImageCallback): this; - dither565(cb?: ImageCallback): this; - dither16(cb?: ImageCallback): this; - histogram(): { - r: number[]; - g: number[]; - b: number[]; - }; - normalize(cb?: ImageCallback): this; - invert(cb?: ImageCallback): this; - gaussian(r: number, cb?: ImageCallback): this; - composite( - src: Jimp, - x: number, - y: number, - options?: BlendMode, - cb?: ImageCallback - ): this; - blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; - blit( - src: Jimp, - x: number, - y: number, - srcx: number, - srcy: number, - srcw: number, - srch: number, - cb?: ImageCallback - ): this; - mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; - - // Functions - appendConstructorOption( - name: string, - test: (...args: T[]) => boolean, - run: ( - this: Jimp, - resolve: (jimp: Jimp) => any, - reject: (reason: Error) => any, - ...args: T[] - ) => any - ): void; - read(path: string): Promise; - read(image: Jimp): Promise; - read(data: Buffer): Promise; - read(w: number, h: number, background?: number | string): Promise; - create(path: string): Promise; - create(image: Jimp): Promise; - create(data: Buffer): Promise; - create(w: number, h: number, background?: number | string): Promise; - rgbaToInt( - r: number, - g: number, - b: number, - a: number, - cb: GenericCallback - ): number; - intToRGBA(i: number, cb?: GenericCallback): RGBA; - cssColorToHex(cssColor: string): number; - limit255(n: number): number; - diff( - img1: Jimp, - img2: Jimp, - threshold?: number - ): { - percent: number; - image: Jimp; - }; - distance(img1: Jimp, img2: Jimp): number; - compareHashes(hash1: string, hash2: string): number; - colorDiff(rgba1: RGB, rgba2: RGB): number; - colorDiff(rgba1: RGBA, rgba2: RGBA): number; - loadFont(file: string): Promise; - loadFont(file: string, cb: GenericCallback): Promise; - measureText(font: Font, text: PrintableText): number; - measureTextHeight(font: Font, text: PrintableText, maxWidth: number): number; -} - -type GenericCallback = ( - this: TThis, - err: Error | null, - value: T -) => U; - -type ImageCallback = ( - this: Jimp, - err: Error | null, - value: Jimp, - coords: { - x: number; - y: number; - } -) => U; - -type ColorActionName = - | 'mix' - | 'tint' - | 'shade' - | 'xor' - | 'red' - | 'green' - | 'blue' - | 'hue'; - -type ColorAction = { - apply: ColorActionName; - params: any; -}; - -type BlendMode = { - mode: string; - opacitySource: number; - opacityDest: number; -}; - -type ChangeName = 'background' | 'scan' | 'crop'; - -type ListenableName = - | 'any' - | 'initialized' - | 'before-change' - | 'changed' - | 'before-clone' - | 'cloned' - | ChangeName; - -type ListenerData = T extends 'any' - ? any - : T extends ChangeName - ? { - eventName: 'before-change' | 'changed'; - methodName: T; - [key: string]: any; - } - : { - eventName: T; - methodName: T extends 'initialized' - ? 'constructor' - : T extends 'before-change' | 'changed' - ? ChangeName - : T extends 'before-clone' | 'cloned' ? 'clone' : any; - }; - -type PrintableText = - | any - | { - text: string; - alignmentX: number; - alignmentY: number; - }; - -type URLOptions = { - url: string; - compression?: boolean; - headers: { - [key: string]: any; - }; -}; - -export interface Bitmap { - data: Buffer; - width: number; - height: number; -} -export interface RGB { - r: number; - g: number; - b: number; -} -export interface RGBA { - r: number; - g: number; - b: number; - a: number; -} - -export interface FontChar { - id: number; - x: number; - y: number; - width: number; - height: number; - xoffset: number; - yoffset: number; - xadvance: number; - page: number; - chnl: number; -} - -export interface FontInfo { - face: string; - size: number; - bold: number; - italic: number; - charset: string; - unicode: number; - stretchH: number; - smooth: number; - aa: number; - padding: [number, number, number, number]; - spacing: [number, number]; -} - -export interface FontCommon { - lineHeight: number; - base: number; - scaleW: number; - scaleH: number; - pages: number; - packed: number; - alphaChnl: number; - redChnl: number; - greenChnl: number; - blueChnl: number; -} - -export interface Font { - chars: { - [char: string]: FontChar; - }; - kernings: { - [firstString: string]: { - [secondString: string]: number; - }; - }; - pages: string[]; - common: FontCommon; - info: FontInfo; -} diff --git a/packages/jimp/package.json b/packages/jimp/package.json index e304b8633..3e6e960f7 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -5,13 +5,13 @@ "main": "dist/index.js", "module": "es/index.js", "browser": "browser/lib/jimp.js", - "types": "jimp.d.ts", + "types": "index.d.ts", "tonicExampleFilename": "example.js", "files": [ "browser", "dist", "es", - "jimp.d.ts", + "index.d.ts", "fonts" ], "repository": { diff --git a/packages/plugin-blit/index.d.ts b/packages/plugin-blit/index.d.ts new file mode 100644 index 000000000..d62d0c577 --- /dev/null +++ b/packages/plugin-blit/index.d.ts @@ -0,0 +1,17 @@ +import { Jimp, ImageCallback, IllformedPlugin } from '@jimp/core'; + +interface Blit extends IllformedPlugin { + blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + blit( + src: Jimp, + x: number, + y: number, + srcx: number, + srcy: number, + srcw: number, + srch: number, + cb?: ImageCallback + ): this; +} + +export default function(): Blit; diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 5a80262c3..cdac06818 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -4,6 +4,7 @@ "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-blur/index.d.ts b/packages/plugin-blur/index.d.ts new file mode 100644 index 000000000..e8c8b7e74 --- /dev/null +++ b/packages/plugin-blur/index.d.ts @@ -0,0 +1,7 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Blur extends IllformedPlugin { + blur(r: number, cb?: ImageCallback): this; +} + +export default function(): Blur; diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 96ae5d7e8..b37becdf5 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -4,6 +4,7 @@ "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-circle/index.d.ts b/packages/plugin-circle/index.d.ts new file mode 100644 index 000000000..eb40488df --- /dev/null +++ b/packages/plugin-circle/index.d.ts @@ -0,0 +1,12 @@ +import { ImageCallback } from '@jimp/core'; + +interface Circle { + circle(options?: { + radius: number, + x: number, + y: number + }, cb?: ImageCallback): this; + circle(cb?: ImageCallback): this; +} + +export default function(): Circle; diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 183737689..b76c29ffd 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -4,6 +4,7 @@ "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-color/index.d.ts b/packages/plugin-color/index.d.ts new file mode 100644 index 000000000..b77e925ad --- /dev/null +++ b/packages/plugin-color/index.d.ts @@ -0,0 +1,56 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +type ColorActionName = + | 'mix' + | 'tint' + | 'shade' + | 'xor' + | 'red' + | 'green' + | 'blue' + | 'hue'; + +type ColorAction = { + apply: ColorActionName; + params: any; +}; + +interface Color extends IllformedPlugin { + brightness(val: number, cb?: ImageCallback): this; + contrast(val: number, cb?: ImageCallback): this; + posterize(n: number, cb?: ImageCallback): this; + greyscale(cb?: ImageCallback): this; + grayscale(cb?: ImageCallback): this; + opacity(f: number, cb?: ImageCallback): this; + sepia(cb?: ImageCallback): this; + fade(f: number, cb?: ImageCallback): this; + convolution(kernel: number[][], cb?: ImageCallback): this; + convolution( + kernel: number[][], + edgeHandling: string, + cb?: ImageCallback + ): this; + opaque(cb?: ImageCallback): this; + pixelate(size: number, cb?: ImageCallback): this; + pixelate( + size: number, + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): this; + convolute(kernel: number[][], cb?: ImageCallback): this; + convolute( + kernel: number[][], + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): this; + color(actions: ColorAction[], cb?: ImageCallback): this; + colour(actions: ColorAction[], cb?: ImageCallback): this; +} + +export default function(): Color; diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 2b1a4a45a..78103f59c 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -4,6 +4,7 @@ "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-contain/index.d.ts b/packages/plugin-contain/index.d.ts new file mode 100644 index 000000000..517e2fa1f --- /dev/null +++ b/packages/plugin-contain/index.d.ts @@ -0,0 +1,16 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Contain extends IllformedPlugin { + contain(w: number, h: number, cb?: ImageCallback): this; + contain(w: number, h: number, mode?: string, cb?: ImageCallback): this; + contain(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; + contain( + w: number, + h: number, + alignBits?: number, + mode?: string, + cb?: ImageCallback + ): this; +} + +export default function(): Contain; diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 14f36694e..b8c1cd301 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -4,6 +4,7 @@ "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-cover/index.d.ts b/packages/plugin-cover/index.d.ts new file mode 100644 index 000000000..114c86642 --- /dev/null +++ b/packages/plugin-cover/index.d.ts @@ -0,0 +1,15 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Cover extends IllformedPlugin { + cover(w: number, h: number, cb?: ImageCallback): this; + cover(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; + cover( + w: number, + h: number, + alignBits?: number, + mode?: string, + cb?: ImageCallback + ): this; +} + +export default function(): Cover; diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 9c2de2c21..dcb58a821 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -4,6 +4,7 @@ "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-crop/index.d.ts b/packages/plugin-crop/index.d.ts new file mode 100644 index 000000000..91bb96521 --- /dev/null +++ b/packages/plugin-crop/index.d.ts @@ -0,0 +1,33 @@ +import { Jimp, ImageCallback } from '@jimp/core'; + +interface Crop { + class: { + crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): This; + cropQuiet( + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): This; + + autocrop(tolerance?: number, cb?: ImageCallback): This; + autocrop(cropOnlyFrames?: boolean, cb?: ImageCallback): This; + autocrop( + tolerance?: number, + cropOnlyFrames?: boolean, + cb?: ImageCallback + ): This; + autocrop( + options: { + tolerance?: number; + cropOnlyFrames?: boolean; + cropSymmetric?: boolean; + leaveBorder?: number; + }, + cb?: ImageCallback + ): This; + } +} + +export default function(): Crop; diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index dc81c80f5..13eed4d3a 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -4,6 +4,7 @@ "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-crop/test/crop.test.js b/packages/plugin-crop/test/crop.test.js index 92144f812..88f64973b 100644 --- a/packages/plugin-crop/test/crop.test.js +++ b/packages/plugin-crop/test/crop.test.js @@ -7,13 +7,7 @@ const jimp = configure({ plugins: [crop] }, Jimp); describe('crop', () => { // 6x5 size - const testImage = mkJGD( - ' ◆◆ ', - ' ◆▦▦◆ ', - '◆▦▦▦▦◆', - ' ◆▦▦◆ ', - ' ◆◆ ' - ); + const testImage = mkJGD(' ◆◆ ', ' ◆▦▦◆ ', '◆▦▦▦▦◆', ' ◆▦▦◆ ', ' ◆◆ '); it('full width from top', async () => { const imgSrc = await jimp.read(testImage); @@ -21,12 +15,7 @@ describe('crop', () => { imgSrc .crop(0, 0, 6, 2) .getJGDSync() - .should.be.sameJGD( - mkJGD( - ' ◆◆ ', - ' ◆▦▦◆ ', - ) - ); + .should.be.sameJGD(mkJGD(' ◆◆ ', ' ◆▦▦◆ ')); }); it('full width from bottom', async () => { @@ -35,43 +24,25 @@ describe('crop', () => { imgSrc .crop(0, 3, 6, 2) .getJGDSync() - .should.be.sameJGD( - mkJGD( - ' ◆▦▦◆ ', - ' ◆◆ ' - ) - ); + .should.be.sameJGD(mkJGD(' ◆▦▦◆ ', ' ◆◆ ')); }); - + it('full width from middle', async () => { const imgSrc = await jimp.read(testImage); imgSrc .crop(0, 2, 6, 2) .getJGDSync() - .should.be.sameJGD( - mkJGD( - '◆▦▦▦▦◆', - ' ◆▦▦◆ ' - ) - ); + .should.be.sameJGD(mkJGD('◆▦▦▦▦◆', ' ◆▦▦◆ ')); }); - + it('full height from left', async () => { const imgSrc = await jimp.read(testImage); imgSrc .crop(0, 0, 2, 5) .getJGDSync() - .should.be.sameJGD( - mkJGD( - ' ', - ' ◆', - '◆▦', - ' ◆', - ' ' - ) - ); + .should.be.sameJGD(mkJGD(' ', ' ◆', '◆▦', ' ◆', ' ')); }); it('full height from right', async () => { @@ -80,15 +51,7 @@ describe('crop', () => { imgSrc .crop(4, 0, 2, 5) .getJGDSync() - .should.be.sameJGD( - mkJGD( - ' ', - '◆ ', - '▦◆', - '◆ ', - ' ' - ) - ); + .should.be.sameJGD(mkJGD(' ', '◆ ', '▦◆', '◆ ', ' ')); }); it('full height from middle', async () => { @@ -97,14 +60,6 @@ describe('crop', () => { imgSrc .crop(2, 0, 2, 5) .getJGDSync() - .should.be.sameJGD( - mkJGD( - '◆◆', - '▦▦', - '▦▦', - '▦▦', - '◆◆' - ) - ); + .should.be.sameJGD(mkJGD('◆◆', '▦▦', '▦▦', '▦▦', '◆◆')); }); }); diff --git a/packages/plugin-displace/index.d.ts b/packages/plugin-displace/index.d.ts new file mode 100644 index 000000000..ae8a90e2d --- /dev/null +++ b/packages/plugin-displace/index.d.ts @@ -0,0 +1,7 @@ +import { Jimp, ImageCallback, IllformedPlugin } from '@jimp/core'; + +interface Displace extends IllformedPlugin { + displace(map: Jimp, offset: number, cb?: ImageCallback): this; +} + +export default function(): Displace; diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index fd94bf729..9b3f38b65 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -4,6 +4,7 @@ "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-dither/index.d.ts b/packages/plugin-dither/index.d.ts new file mode 100644 index 000000000..3b03b7413 --- /dev/null +++ b/packages/plugin-dither/index.d.ts @@ -0,0 +1,8 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Dither extends IllformedPlugin { + dither565(cb?: ImageCallback): this; + dither16(cb?: ImageCallback): this; +} + +export default function(): Dither; diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 51af633a8..d1afe92c2 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -4,6 +4,7 @@ "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-fisheye/index.d.ts b/packages/plugin-fisheye/index.d.ts new file mode 100644 index 000000000..6944a727b --- /dev/null +++ b/packages/plugin-fisheye/index.d.ts @@ -0,0 +1,8 @@ +import { ImageCallback } from '@jimp/core'; + +interface Fisheye { + fishEye(opts?: { r: number }, cb?: ImageCallback): this; + fishEye(cb?: ImageCallback): this; +} + +export default function(): Fisheye; diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 245d84639..e42de6d7a 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -4,6 +4,7 @@ "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-flip/index.d.ts b/packages/plugin-flip/index.d.ts new file mode 100644 index 000000000..01e072ff9 --- /dev/null +++ b/packages/plugin-flip/index.d.ts @@ -0,0 +1,8 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Flip extends IllformedPlugin { + flip(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; + mirror(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; +} + +export default function(): Flip; diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 1d44ab03c..635082f57 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -4,6 +4,7 @@ "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-gaussian/index.d.ts b/packages/plugin-gaussian/index.d.ts new file mode 100644 index 000000000..011f3eeef --- /dev/null +++ b/packages/plugin-gaussian/index.d.ts @@ -0,0 +1,7 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Gaussian extends IllformedPlugin { + gaussian(r: number, cb?: ImageCallback): this; +} + +export default function(): Gaussian; diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index d8446961c..5693f30aa 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -4,6 +4,7 @@ "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-invert/index.d.ts b/packages/plugin-invert/index.d.ts new file mode 100644 index 000000000..57fa40dbc --- /dev/null +++ b/packages/plugin-invert/index.d.ts @@ -0,0 +1,7 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Invert extends IllformedPlugin { + invert(cb?: ImageCallback): this; +} + +export default function(): Invert; diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 18c889ab2..37d54a8ef 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -4,6 +4,7 @@ "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-mask/index.d.ts b/packages/plugin-mask/index.d.ts new file mode 100644 index 000000000..b8d4ea106 --- /dev/null +++ b/packages/plugin-mask/index.d.ts @@ -0,0 +1,7 @@ +import { IllformedPlugin, ImageCallback, Jimp } from '@jimp/core'; + +interface Mask extends IllformedPlugin { + mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; +} + +export default function(): Mask; diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index e5b1f942d..d6fb4e4b6 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -4,6 +4,7 @@ "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-normalize/index.d.ts b/packages/plugin-normalize/index.d.ts new file mode 100644 index 000000000..105d639be --- /dev/null +++ b/packages/plugin-normalize/index.d.ts @@ -0,0 +1,7 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Normalize extends IllformedPlugin { + normalize(cb ?: ImageCallback): this; +} + +export default function(): Normalize; diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 0c6c7a625..238dfb065 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -4,6 +4,7 @@ "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-print/index.d.ts b/packages/plugin-print/index.d.ts new file mode 100644 index 000000000..2fda985e5 --- /dev/null +++ b/packages/plugin-print/index.d.ts @@ -0,0 +1,119 @@ +import { Jimp, GenericCallback, ImageCallback } from '@jimp/core'; + +export interface FontChar { + id: number; + x: number; + y: number; + width: number; + height: number; + xoffset: number; + yoffset: number; + xadvance: number; + page: number; + chnl: number; +} + +export interface FontInfo { + face: string; + size: number; + bold: number; + italic: number; + charset: string; + unicode: number; + stretchH: number; + smooth: number; + aa: number; + padding: [number, number, number, number]; + spacing: [number, number]; +} + +export interface FontCommon { + lineHeight: number; + base: number; + scaleW: number; + scaleH: number; + pages: number; + packed: number; + alphaChnl: number; + redChnl: number; + greenChnl: number; + blueChnl: number; +} + +interface Font { + chars: { + [char: string]: FontChar; + }; + kernings: { + [firstString: string]: { + [secondString: string]: number; + }; + }; + pages: string[]; + common: FontCommon; + info: FontInfo; +} + +type PrintableText = + | any + | { + text: string; + alignmentX: number; + alignmentY: number; +}; + +interface Print { + constants: { + measureText(font: Font, text: PrintableText): number; + measureTextHeight(font: Font, text: PrintableText, maxWidth: number): number; + + // Font locations + FONT_SANS_8_BLACK: string; + FONT_SANS_10_BLACK: string; + FONT_SANS_12_BLACK: string; + FONT_SANS_14_BLACK: string; + FONT_SANS_16_BLACK: string; + FONT_SANS_32_BLACK: string; + FONT_SANS_64_BLACK: string; + FONT_SANS_128_BLACK: string; + + FONT_SANS_8_WHITE: string; + FONT_SANS_16_WHITE: string; + FONT_SANS_32_WHITE: string; + FONT_SANS_64_WHITE: string; + FONT_SANS_128_WHITE: string; + + loadFont(file: string): Promise; + loadFont(file: string, cb: GenericCallback): Promise; + } + + class: { + // Text methods + print( + font: Font, + x: number, + y: number, + text: PrintableText, + cb?: ImageCallback + ): This; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + cb?: ImageCallback + ): This; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + maxHeight?: number, + cb?: ImageCallback + ): This; + } +} + +export default function(): Print; diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index e0df6bbce..200ac2f75 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -4,6 +4,7 @@ "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-resize/index.d.ts b/packages/plugin-resize/index.d.ts new file mode 100644 index 000000000..30a70eac2 --- /dev/null +++ b/packages/plugin-resize/index.d.ts @@ -0,0 +1,19 @@ +import { Jimp, ImageCallback } from '@jimp/core'; + +interface Resize { + constants: { + // resize methods + RESIZE_NEAREST_NEIGHBOR: 'nearestNeighbor'; + RESIZE_BILINEAR: 'bilinearInterpolation'; + RESIZE_BICUBIC: 'bicubicInterpolation'; + RESIZE_HERMITE: 'hermiteInterpolation'; + RESIZE_BEZIER: 'bezierInterpolation'; + } + + class: { + resize(w: number, h: number, cb?: ImageCallback): This; + resize(w: number, h: number, mode?: string, cb?: ImageCallback): This; + } +} + +export default function(): Resize; diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index dcb7281b2..016cba869 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -4,6 +4,7 @@ "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-rotate/index.d.ts b/packages/plugin-rotate/index.d.ts new file mode 100644 index 000000000..771dabe3b --- /dev/null +++ b/packages/plugin-rotate/index.d.ts @@ -0,0 +1,8 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Rotate extends IllformedPlugin { + rotate(deg: number, cb?: ImageCallback): this; + rotate(deg: number, mode: string | boolean, cb?: ImageCallback): this; +} + +export default function(): Rotate; diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 51df16b47..1c0a164d4 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -4,6 +4,7 @@ "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-scale/index.d.ts b/packages/plugin-scale/index.d.ts new file mode 100644 index 000000000..ac04589c6 --- /dev/null +++ b/packages/plugin-scale/index.d.ts @@ -0,0 +1,10 @@ +import { IllformedPlugin, ImageCallback } from '@jimp/core'; + +interface Scale extends IllformedPlugin { + scale(f: number, cb?: ImageCallback): this; + scale(f: number, mode?: string, cb?: ImageCallback): this; + scaleToFit(w: number, h: number, cb?: ImageCallback): this; + scaleToFit(w: number, h: number, mode?: string, cb?: ImageCallback): this; +} + +export default function(): Scale; diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index fb63d6f71..5e410602c 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -4,6 +4,7 @@ "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/plugin-shadow/index.d.ts b/packages/plugin-shadow/index.d.ts new file mode 100644 index 000000000..81a13f19c --- /dev/null +++ b/packages/plugin-shadow/index.d.ts @@ -0,0 +1,14 @@ +import { ImageCallback } from '@jimp/core'; + +interface Shadow { + shadow(options?: { + size?: number, + opacity?: number, + x?: number, + y?: number + }, + cb?: ImageCallback): this; + shadow(cb?: ImageCallback): this; +} + +export default function(): Shadow; diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index b72822fac..401b184cc 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -4,6 +4,7 @@ "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugin-threshold/index.d.ts b/packages/plugin-threshold/index.d.ts new file mode 100644 index 000000000..527f1a229 --- /dev/null +++ b/packages/plugin-threshold/index.d.ts @@ -0,0 +1,11 @@ +import { ImageCallback } from '@jimp/core'; + +interface Threshold { + threshold(opts: { + max: number, + replace?: number, + autoGreyscale?: boolean + }, cb?: ImageCallback): this; +} + +export default function(): Threshold; diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 250aefd98..4e8df2fdd 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -4,6 +4,7 @@ "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/plugins/index.d.ts b/packages/plugins/index.d.ts new file mode 100644 index 000000000..66a8f0928 --- /dev/null +++ b/packages/plugins/index.d.ts @@ -0,0 +1,63 @@ +import dither from '@jimp/plugin-dither'; +import resize from '@jimp/plugin-resize'; +import blit from '@jimp/plugin-blit'; +import rotate from '@jimp/plugin-rotate'; +import color from '@jimp/plugin-color'; +import print from '@jimp/plugin-print'; +import blur from '@jimp/plugin-blur'; +import crop from '@jimp/plugin-crop'; +import normalize from '@jimp/plugin-normalize'; +import invert from '@jimp/plugin-invert'; +import gaussian from '@jimp/plugin-gaussian'; +import flip from '@jimp/plugin-flip'; +import mask from '@jimp/plugin-mask'; +import scale from '@jimp/plugin-scale'; +import displace from '@jimp/plugin-displace'; +import contain from '@jimp/plugin-contain'; +import cover from '@jimp/plugin-cover'; + +type DitherRet = ReturnType +type ResizeRet = ReturnType +type BlitRet = ReturnType +type RotateRet = ReturnType +type ColorRet = ReturnType +type PrintRet = ReturnType +type BlurRet = ReturnType +type CropRet = ReturnType +type NormalizeRet = ReturnType +type InvertRet = ReturnType +type GaussianRet = ReturnType +type FlipRet = ReturnType +type MaskRet = ReturnType +type ScaleRet = ReturnType +type DisplaceRet = ReturnType +type ContainRet = ReturnType +type CoverRet = ReturnType + +/** + * This is made union and not intersection to avoid issues with + * `IllformedPlugin` and `WellFormedPlugin` when using typings with Jimp + * generic + * + * In reality, this should be an intersection but our type data isn't + * clever enough to figure out what's a class and what's not/etc + */ +type Plugins = DitherRet | + ResizeRet | + BlitRet | + RotateRet | + ColorRet | + PrintRet | + BlurRet | + CropRet | + NormalizeRet | + InvertRet | + GaussianRet | + FlipRet | + MaskRet | + ScaleRet | + DisplaceRet | + ContainRet | + CoverRet; + +export default function(jimpEvChange: any): Plugins; diff --git a/packages/plugins/package.json b/packages/plugins/package.json index dfec8a65f..f288ed1f3 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/type-bmp/index.d.ts b/packages/type-bmp/index.d.ts new file mode 100644 index 000000000..bbb9baec6 --- /dev/null +++ b/packages/type-bmp/index.d.ts @@ -0,0 +1,24 @@ +import { DecoderFn, EncoderFn } from '@jimp/core'; + +interface Bmp { + constants: { + MIME_BMP: 'image/bmp'; + MIME_X_MS_BMP: 'image/x-ms-bmp'; + } + + mime: { + 'image/bmp': string[] + } + + decoders: { + 'image/bmp': DecoderFn + 'image/x-ms-bmp': DecoderFn + } + + encoders: { + 'image/bmp': EncoderFn + 'image/x-ms-bmp': EncoderFn + } +} + +export default function(): Bmp; diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 3059ea590..2693bab70 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/type-gif/index.d.ts b/packages/type-gif/index.d.ts new file mode 100644 index 000000000..59ac07783 --- /dev/null +++ b/packages/type-gif/index.d.ts @@ -0,0 +1,17 @@ +import { DecoderFn } from '@jimp/core'; + +interface Gif { + mime: { + 'image/gif': string[] + } + + constants: { + MIME_GIF: 'image/gif'; + } + + decoders: { + 'image/gif': DecoderFn + } +} + +export default function(): Gif; diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 01149f39d..3c34e5157 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/type-jpeg/index.d.ts b/packages/type-jpeg/index.d.ts new file mode 100644 index 000000000..0fc8e66c9 --- /dev/null +++ b/packages/type-jpeg/index.d.ts @@ -0,0 +1,25 @@ +import { Jimp, DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; + +interface Jpeg { + mime: { 'image/jpeg': string[] }, + + constants: { + 'image/jpeg': string + } + + encoders: { + 'image/jpeg': EncoderFn + } + + decoders: { + 'image/jpeg': DecoderFn + } + + class: { + MIME_JPEG: 'image/jpeg'; + _quality: number; + quality: (n: number, cb?: ImageCallback) => This; + } +} + +export default function(): Jpeg; diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 34ee5101d..bf18bb7d7 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/type-png/index.d.ts b/packages/type-png/index.d.ts new file mode 100644 index 000000000..37bd1e72d --- /dev/null +++ b/packages/type-png/index.d.ts @@ -0,0 +1,38 @@ +import { Jimp, DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; + +interface PNG { + + mime: { 'image/png': string[] }, + + hasAlpha: { 'image/png': true }, + + decoders: { + 'image/png': DecoderFn + } + encoders: { + 'image/png': EncoderFn + } + + class: { + _deflateLevel: number, + _deflateStrategy: number, + _filterType: number, + _colorType: number, + deflateLevel(l: number, cb?: ImageCallback): This; + deflateStrategy(s: number, cb?: ImageCallback): This; + filterType(f: number, cb?: ImageCallback): This; + colorType(s: number, cb?: ImageCallback): This; + } + constants: { + MIME_PNG: 'image/png'; + // PNG filter types + PNG_FILTER_AUTO: -1; + PNG_FILTER_NONE: 0; + PNG_FILTER_SUB: 1; + PNG_FILTER_UP: 2; + PNG_FILTER_AVERAGE: 3; + PNG_FILTER_PATH: 4; + } +} + +export default function(): PNG; diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 6b8877e3e..5b9c7ebee 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/type-tiff/index.d.ts b/packages/type-tiff/index.d.ts new file mode 100644 index 000000000..fdd0c5fef --- /dev/null +++ b/packages/type-tiff/index.d.ts @@ -0,0 +1,16 @@ +import { DecoderFn, EncoderFn } from '@jimp/core'; + +interface Tiff { + mime: { 'image/tiff': string[] } + decoders: { + 'image/tiff': DecoderFn + } + encoders: { + 'image/tiff': EncoderFn + } + constants: { + MIME_TIFF: 'image/tiff'; + } +} + +export default function(): Tiff; diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index b52eafd2b..072b1ab6e 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "test": "cross-env BABEL_ENV=test mocha --require @babel/register", "test:watch": "npm run test -- --reporter min --watch", diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts new file mode 100644 index 000000000..ec2df4ec9 --- /dev/null +++ b/packages/types/index.d.ts @@ -0,0 +1,27 @@ +import jpeg from '@jimp/jpeg'; +import png from '@jimp/png'; +import bmp from '@jimp/bmp'; +import tiff from '@jimp/tiff'; +import gif from '@jimp/gif'; + +type JpegRet = ReturnType +type PngRet = ReturnType +type BmpRet = ReturnType +type TiffRet = ReturnType +type GifRet = ReturnType + +/** + * This is made union and not intersection to avoid issues with + * `IllformedPlugin` and `WellFormedPlugin` when using typings with Jimp + * generic + * + * In reality, this should be an intersection but our type data isn't + * clever enough to figure out what's a class and what's not/etc + */ +type Types = JpegRet | + PngRet | + BmpRet | + TiffRet | + GifRet + +export default function(): Types; diff --git a/packages/types/package.json b/packages/types/package.json index 20a3d2c68..eb8c246ff 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -4,6 +4,7 @@ "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", @@ -27,6 +28,9 @@ "peerDependencies": { "@jimp/custom": ">=0.3.5" }, + "devDependencies": { + "@types/node": "^12.6.8" + }, "publishConfig": { "access": "public" } diff --git a/packages/utils/README.md b/packages/utils/README.md index 01678e733..98cbfb74d 100644 --- a/packages/utils/README.md +++ b/packages/utils/README.md @@ -56,7 +56,12 @@ function removeRed(image) { It's possible to make an iterator scan with a `for ... of`, if you want to `break` the scan before it reaches the end, but note, that this iterator has a huge performance implication: ```js -for (const { x, y, idx, image } of scanIterator(image, 0, 0, image.bitmap.width, image.bitmap.height)) { - +for (const { x, y, idx, image } of scanIterator( + image, + 0, + 0, + image.bitmap.width, + image.bitmap.height +)) { } ``` diff --git a/packages/utils/index.d.ts b/packages/utils/index.d.ts new file mode 100644 index 000000000..f4eb2edcf --- /dev/null +++ b/packages/utils/index.d.ts @@ -0,0 +1,9 @@ +import { Image } from './../../types/src/index.d'; +import { ThrowStatement } from 'typescript'; + +export function isNodePattern(cb: Function): true; +export function isNodePattern(cb: Omit): false; + +export function throwError(error: string | Error, cb?: (err: Error) => void): ThrowStatement; + +export function scan(image: Image, x: number, y: number, w: number, h: number, f: (image: Image, _x: number, _y: number, idx: number) => void): Image; diff --git a/packages/utils/package.json b/packages/utils/package.json index cf3330e82..3041ff9e3 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -4,6 +4,7 @@ "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", + "types": "index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/yarn.lock b/yarn.lock index c9a0ce884..4a983c7a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1620,6 +1620,11 @@ version "10.9.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.2.tgz#f0ab8dced5cd6c56b26765e1c0d9e4fdcc9f2a00" +"@types/node@^12.6.8": + version "12.6.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c" + integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg== + "@types/yargs@^11.1.1": version "11.1.1" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.1.tgz#2e724257167fd6b615dbe4e54301e65fe597433f" From 4238e4aa3559536cae1e70f7f3ccd76c3b5f0c1d Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sat, 7 Sep 2019 17:19:48 +0000 Subject: [PATCH 005/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4aa48035..1235c0755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.8.0 (Sat Sep 07 2019) + +#### 🚀 Enhancement + +- `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Made typings plugin friendly & add typings for every package [#770](https://github.com/oliver-moran/jimp/pull/770) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.7.0 (Fri Sep 06 2019) #### 🚀 Enhancement From 11f2dcb229e4adeff449fbc0c8dee89586a576d3 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sat, 7 Sep 2019 17:19:50 +0000 Subject: [PATCH 006/223] Bump version to: 0.8.0 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index a4c5e3ed7..699852c75 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.7.0" + "version": "0.8.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 2f41c33a2..c66c2a46c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.7.0", + "version": "0.8.0", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.7.0", + "@jimp/custom": "^0.8.0", "chalk": "^2.4.1", - "jimp": "^0.7.0", + "jimp": "^0.8.0", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index f526587b7..006fafc33 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.7.0", + "version": "0.8.0", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index c68e9e0cc..d02cf25ab 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.7.0", + "version": "0.8.0", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.7.0", + "@jimp/core": "^0.8.0", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 3e6e960f7..a58ae3b71 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.7.0", + "version": "0.8.0", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -51,14 +51,14 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/plugins": "^0.7.0", - "@jimp/types": "^0.7.0", + "@jimp/custom": "^0.8.0", + "@jimp/plugins": "^0.8.0", + "@jimp/types": "^0.8.0", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@jimp/test-utils": "^0.7.0", + "@jimp/test-utils": "^0.8.0", "babelify": "^10.0.0", "browserify": "^16.2.2", "envify": "^4.1.0", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index cdac06818..776ade705 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.7.0", + "version": "0.8.0", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/jpeg": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/jpeg": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index b37becdf5..e75a41ba2 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.7.0", + "version": "0.8.0", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index b76c29ffd..19b952641 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.7.0", + "version": "0.8.0", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 78103f59c..5f64b467d 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.7.0", + "version": "0.8.0", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0", - "@jimp/types": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0", + "@jimp/types": "^0.8.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index b8c1cd301..2b156d992 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.7.0", + "version": "0.8.0", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/plugin-blit": "^0.7.0", - "@jimp/plugin-resize": "^0.7.0", - "@jimp/plugin-scale": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/plugin-blit": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0", + "@jimp/plugin-scale": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index dcb58a821..548ffe9b1 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.7.0", + "version": "0.8.0", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/plugin-crop": "^0.7.0", - "@jimp/plugin-resize": "^0.7.0", - "@jimp/plugin-scale": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/plugin-crop": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0", + "@jimp/plugin-scale": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 13eed4d3a..3023127a8 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.7.0", + "version": "0.8.0", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 9b3f38b65..b731c2dd1 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.7.0", + "version": "0.8.0", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index d1afe92c2..eb1aa2218 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.7.0", + "version": "0.8.0", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index e42de6d7a..1460b1289 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.7.0", + "version": "0.8.0", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 635082f57..a69e402e7 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.7.0", + "version": "0.8.0", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 5693f30aa..d65321b09 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.7.0", + "version": "0.8.0", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 37d54a8ef..d3a80ad8a 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.7.0", + "version": "0.8.0", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index d6fb4e4b6..3b616dc15 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.7.0", + "version": "0.8.0", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 238dfb065..61dbcc158 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.7.0", + "version": "0.8.0", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 200ac2f75..d6e1c035a 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.7.0", + "version": "0.8.0", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/plugin-blit": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/plugin-blit": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 016cba869..36fea6ffa 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.7.0", + "version": "0.8.0", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 1c0a164d4..647fe277d 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.7.0", + "version": "0.8.0", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/plugin-blit": "^0.7.0", - "@jimp/plugin-crop": "^0.7.0", - "@jimp/plugin-resize": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/plugin-blit": "^0.8.0", + "@jimp/plugin-crop": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 5e410602c..196e81de2 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.7.0", + "version": "0.8.0", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 401b184cc..360ddc960 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.7.0", + "version": "0.8.0", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/plugin-blur": "^0.7.0", - "@jimp/plugin-resize": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/plugin-blur": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 4e8df2fdd..8079db2dd 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.7.0", + "version": "0.8.0", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.6.3" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/jpeg": "^0.7.0", - "@jimp/plugin-color": "^0.7.0", - "@jimp/plugin-resize": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/jpeg": "^0.8.0", + "@jimp/plugin-color": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index f288ed1f3..eaeddaec2 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.7.0", - "@jimp/plugin-blur": "^0.7.0", - "@jimp/plugin-color": "^0.7.0", - "@jimp/plugin-contain": "^0.7.0", - "@jimp/plugin-cover": "^0.7.0", - "@jimp/plugin-crop": "^0.7.0", - "@jimp/plugin-displace": "^0.7.0", - "@jimp/plugin-dither": "^0.7.0", - "@jimp/plugin-flip": "^0.7.0", - "@jimp/plugin-gaussian": "^0.7.0", - "@jimp/plugin-invert": "^0.7.0", - "@jimp/plugin-mask": "^0.7.0", - "@jimp/plugin-normalize": "^0.7.0", - "@jimp/plugin-print": "^0.7.0", - "@jimp/plugin-resize": "^0.7.0", - "@jimp/plugin-rotate": "^0.7.0", - "@jimp/plugin-scale": "^0.7.0", + "@jimp/plugin-blit": "^0.8.0", + "@jimp/plugin-blur": "^0.8.0", + "@jimp/plugin-color": "^0.8.0", + "@jimp/plugin-contain": "^0.8.0", + "@jimp/plugin-cover": "^0.8.0", + "@jimp/plugin-crop": "^0.8.0", + "@jimp/plugin-displace": "^0.8.0", + "@jimp/plugin-dither": "^0.8.0", + "@jimp/plugin-flip": "^0.8.0", + "@jimp/plugin-gaussian": "^0.8.0", + "@jimp/plugin-invert": "^0.8.0", + "@jimp/plugin-mask": "^0.8.0", + "@jimp/plugin-normalize": "^0.8.0", + "@jimp/plugin-print": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0", + "@jimp/plugin-rotate": "^0.8.0", + "@jimp/plugin-scale": "^0.8.0", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index ba2176a54..2941f7618 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.7.0", + "version": "0.8.0", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.7.0", + "@jimp/custom": "^0.8.0", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 2693bab70..29d516359 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 3c34e5157..e73b7a49a 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index bf18bb7d7..0bff2b434 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 5b9c7ebee..f84b889cc 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.7.0", + "@jimp/utils": "^0.8.0", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 072b1ab6e..841d9098c 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.7.0", - "@jimp/test-utils": "^0.7.0" + "@jimp/custom": "^0.8.0", + "@jimp/test-utils": "^0.8.0" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index eb8c246ff..16711b271 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.7.0", + "version": "0.8.0", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.7.0", - "@jimp/gif": "^0.7.0", - "@jimp/jpeg": "^0.7.0", - "@jimp/png": "^0.7.0", - "@jimp/tiff": "^0.7.0", + "@jimp/bmp": "^0.8.0", + "@jimp/gif": "^0.8.0", + "@jimp/jpeg": "^0.8.0", + "@jimp/png": "^0.8.0", + "@jimp/tiff": "^0.8.0", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 3041ff9e3..a3385c9d0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.7.0", + "version": "0.8.0", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 6c8b9def6a4df7728c3d254fbeac902a6a425f65 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Wed, 11 Sep 2019 22:02:38 -0700 Subject: [PATCH 007/223] Fix 0.8 typings, add type tests (#786) * Fixes typing issues with 0.8 and add initial typing tests * Fix error in utils typing import * Confirmed fixed build, test, and type test, left comments * Moved lengthy `@core` typings to subfiles and barrel index * Initial work to get configure composure working * Fixed error introduced in prior commit, improved type tests * Fixed issues with plugin or types being null * Code cleanup, final fixes * add type tests to CI * Added initial 3.1 types * Move @core/jimp to a class rather than an interface * Minor cleanup, linting, etc --- .circleci/config.yml | 16 + package.json | 9 +- packages/cli/src/load-font.ts | 2 +- packages/core/index.d.ts | 335 -------------- packages/core/package.json | 2 +- packages/core/types/etc.d.ts | 87 ++++ packages/core/types/functions.d.ts | 17 + packages/core/types/index.d.ts | 9 + packages/core/types/jimp.d.ts | 189 ++++++++ packages/core/types/plugins.d.ts | 57 +++ packages/core/types/utils.d.ts | 54 +++ packages/custom/index.d.ts | 14 - packages/custom/package.json | 2 +- packages/custom/types/index.d.ts | 48 ++ packages/custom/types/test.ts | 152 ++++++ packages/custom/types/tsconfig.json | 18 + packages/jimp/index.d.ts | 27 -- packages/jimp/package.json | 9 +- packages/jimp/types/index.d.ts | 590 ++++++++++++++++++++++++ packages/jimp/types/test.ts | 14 + packages/jimp/types/ts3.1/index.d.ts | 29 ++ packages/jimp/types/ts3.1/test.ts | 14 + packages/jimp/types/ts3.1/tsconfig.json | 18 + packages/jimp/types/tsconfig.json | 18 + packages/plugin-blit/index.d.ts | 2 +- packages/plugin-blur/index.d.ts | 4 +- packages/plugin-color/index.d.ts | 4 +- packages/plugin-contain/index.d.ts | 4 +- packages/plugin-cover/index.d.ts | 4 +- packages/plugin-displace/index.d.ts | 2 +- packages/plugin-dither/index.d.ts | 4 +- packages/plugin-flip/index.d.ts | 4 +- packages/plugin-gaussian/index.d.ts | 4 +- packages/plugin-invert/index.d.ts | 4 +- packages/plugin-mask/index.d.ts | 2 +- packages/plugin-normalize/index.d.ts | 4 +- packages/plugin-rotate/index.d.ts | 4 +- packages/plugin-scale/index.d.ts | 4 +- packages/plugin-threshold/package.json | 4 +- packages/plugins/index.d.ts | 2 +- packages/utils/index.d.ts | 2 +- yarn.lock | 168 ++++++- 42 files changed, 1530 insertions(+), 426 deletions(-) delete mode 100644 packages/core/index.d.ts create mode 100644 packages/core/types/etc.d.ts create mode 100644 packages/core/types/functions.d.ts create mode 100644 packages/core/types/index.d.ts create mode 100644 packages/core/types/jimp.d.ts create mode 100644 packages/core/types/plugins.d.ts create mode 100644 packages/core/types/utils.d.ts delete mode 100644 packages/custom/index.d.ts create mode 100644 packages/custom/types/index.d.ts create mode 100644 packages/custom/types/test.ts create mode 100644 packages/custom/types/tsconfig.json delete mode 100644 packages/jimp/index.d.ts create mode 100644 packages/jimp/types/index.d.ts create mode 100644 packages/jimp/types/test.ts create mode 100644 packages/jimp/types/ts3.1/index.d.ts create mode 100644 packages/jimp/types/ts3.1/test.ts create mode 100644 packages/jimp/types/ts3.1/tsconfig.json create mode 100644 packages/jimp/types/tsconfig.json diff --git a/.circleci/config.yml b/.circleci/config.yml index b324d57f7..05cfb164c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,6 +45,15 @@ jobs: name: Lint command: yarn lint + test-types: + <<: *defaults + steps: + - attach_workspace: + at: ~/jimp + - run: + name: Test Types + command: yarn tsTest:custom && yarn tsTest:main + build-node6.14: working_directory: ~/jimp-6.14 docker: @@ -115,17 +124,24 @@ workflows: requires: - install + - test-types: + requires: + - install + - build-node6.14: requires: - lint + - test-types - build-node8: requires: - lint + - test-types - build-node10: requires: - lint + - test-types - release: requires: diff --git a/package.json b/package.json index 7364a36f9..b27290776 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "repository": "oliver-moran/jimp", "author": "Andrew Lisowski ", "publishConfig": { - "registry":"https://registry.npmjs.org/" - }, + "registry": "https://registry.npmjs.org/" + }, "scripts": { "lint": "xo", "test": "cross-env BABEL_ENV=test mocha --require @babel/register './packages/**/test/**/*.test.js' --require ts-node/register ./packages/**/test/*.test.ts", @@ -20,7 +20,9 @@ "clean:build": "rm -rf packages/**/es packages/**/dist", "build": "npm run clean:build && lerna run build --stream", "build:watch": "lerna run build:watch --parallel", - "release": "auto shipit" + "release": "auto shipit", + "tsTest:custom": "dtslint packages/custom/types --expectOnly", + "tsTest:main": "dtslint packages/jimp/types --expectOnly" }, "devDependencies": { "@babel/cli": "^7.1.0", @@ -36,6 +38,7 @@ "babel-plugin-source-map-support": "^2.0.1", "babel-plugin-transform-inline-environment-variables": "^0.4.3", "cross-env": "^5.2.0", + "dtslint": "^0.9.6", "eslint-plugin-prettier": "^2.6.2", "express": "^4.16.3", "husky": "^1.0.0-rc.15", diff --git a/packages/cli/src/load-font.ts b/packages/cli/src/load-font.ts index 217854f14..c68a7ec08 100644 --- a/packages/cli/src/load-font.ts +++ b/packages/cli/src/load-font.ts @@ -4,7 +4,7 @@ import { log } from './log'; export async function loadFont(font?: string, verbose?: boolean) { if (font) { log(` 🔤 Loading font: ${font} ...`, verbose); - return await Jimp.loadFont(Jimp[font] || font); + return await Jimp.loadFont((Jimp[font] as unknown as string) || font); } return; diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts deleted file mode 100644 index 2b9148248..000000000 --- a/packages/core/index.d.ts +++ /dev/null @@ -1,335 +0,0 @@ -export function addConstants(constants: [string, string | number], jimpInstance?: Jimp): void; -export function addJimpMethods(methods: [string, Function], jimpInstance?: Jimp): void; -export function jimpEvMethod(methodName: string, evName: string, method: Function): void; -export function jimpEvChange(methodName: string, method: Function): void; -export function addType(mime: string, extensions: string[]): void; - -interface BaseJimp { - prototype: Jimp; - // Constants - AUTO: -1; - // blend modes - BLEND_SOURCE_OVER: string; - BLEND_DESTINATION_OVER: string; - BLEND_MULTIPLY: string; - BLEND_SCREEN: string; - BLEND_OVERLAY: string; - BLEND_DARKEN: string; - BLEND_LIGHTEN: string; - BLEND_HARDLIGHT: string; - BLEND_DIFFERENCE: string; - BLEND_EXCLUSION: string; - // Align modes for cover, contain, bit masks - HORIZONTAL_ALIGN_LEFT: 1; - HORIZONTAL_ALIGN_CENTER: 2; - HORIZONTAL_ALIGN_RIGHT: 4; - VERTICAL_ALIGN_TOP: 8; - VERTICAL_ALIGN_MIDDLE: 16; - VERTICAL_ALIGN_BOTTOM: 32; - // Edge Handling - EDGE_EXTEND: 1; - EDGE_WRAP: 2; - EDGE_CROP: 3; - // Properties - bitmap: Bitmap; - _quality: number; - _deflateLevel: number; - _deflateStrategy: number; - _filterType: number; - _rgba: boolean; - _background: number; - _originalMime: string; - // Constructors - new(path: string, cb?: ImageCallback): Jimp; - new(urlOptions: URLOptions, cb?: ImageCallback): Jimp; - new(image: Jimp, cb?: ImageCallback): Jimp; - new(data: Buffer, cb?: ImageCallback): Jimp; - new(data: Bitmap, cb?: ImageCallback): Jimp; - new(w: number, h: number, cb?: ImageCallback): Jimp; - new( - w: number, - h: number, - background?: number | string, - cb?: ImageCallback - ): Jimp; - // For custom constructors when using Jimp.appendConstructorOption - new(...args: any[]): Jimp; - // Methods - on( - event: T, - cb: (data: ListenerData) => any - ): any; - parseBitmap( - data: Buffer, - path: string | null | undefined, - cb?: ImageCallback - ): void; - hasAlpha(): boolean; - getHeight(): number; - getWidth(): number; - inspect(): string; - toString(): string; - getMIME(): string; - getExtension(): string; - distanceFromHash(hash: string): number; - write(path: string, cb?: ImageCallback): this; - writeAsync(path: string): Promise; - deflateLevel(l: number, cb?: ImageCallback): this; - deflateStrategy(s: number, cb?: ImageCallback): this; - colorType(s: number, cb?: ImageCallback): this; - filterType(f: number, cb?: ImageCallback): this; - rgba(bool: boolean, cb?: ImageCallback): this; - quality(n: number, cb?: ImageCallback): this; - getBase64(mime: string, cb: GenericCallback): this; - getBase64Async(mime: string): Promise; - hash(cb?: GenericCallback): string; - hash( - base: number | null | undefined, - cb?: GenericCallback - ): string; - getBuffer(mime: string, cb: GenericCallback): this; - getBufferAsync(mime: string): Promise; - getPixelIndex( - x: number, - y: number, - cb?: GenericCallback - ): number; - getPixelIndex( - x: number, - y: number, - edgeHandling: string, - cb?: GenericCallback - ): number; - getPixelColor( - x: number, - y: number, - cb?: GenericCallback - ): number; - getPixelColour( - x: number, - y: number, - cb?: GenericCallback - ): number; - setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; - setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; - clone(cb?: ImageCallback): this; - cloneQuiet(cb?: ImageCallback): this; - background(hex: number, cb?: ImageCallback): this; - backgroundQuiet(hex: number, cb?: ImageCallback): this; - scan( - x: number, - y: number, - w: number, - h: number, - f: (this: this, x: number, y: number, idx: number) => any, - cb?: ImageCallback - ): this; - scanQuiet( - x: number, - y: number, - w: number, - h: number, - f: (this: this, x: number, y: number, idx: number) => any, - cb?: ImageCallback - ): this; - scanIterator( - x: number, - y: number, - w: number, - h: number - ): IterableIterator<{x: number, y: number, idx: number, image: Jimp}>; - - // Effect methods - composite( - src: Jimp, - x: number, - y: number, - options?: BlendMode, - cb?: ImageCallback - ): this; - - // Functions - appendConstructorOption( - name: string, - test: (...args: T[]) => boolean, - run: ( - this: Jimp, - resolve: (jimp: Jimp) => any, - reject: (reason: Error) => any, - ...args: T[] - ) => any - ): void; - read(path: string): Promise; - read(image: Jimp): Promise; - read(data: Buffer): Promise; - read(w: number, h: number, background?: number | string): Promise; - create(path: string): Promise; - create(image: Jimp): Promise; - create(data: Buffer): Promise; - create(w: number, h: number, background?: number | string): Promise; - rgbaToInt( - r: number, - g: number, - b: number, - a: number, - cb: GenericCallback - ): number; - intToRGBA(i: number, cb?: GenericCallback): RGBA; - cssColorToHex(cssColor: string): number; - limit255(n: number): number; - diff( - img1: Jimp, - img2: Jimp, - threshold?: number - ): { - percent: number; - image: Jimp; - }; - distance(img1: Jimp, img2: Jimp): number; - compareHashes(hash1: string, hash2: string): number; - colorDiff(rgba1: RGB, rgba2: RGB): number; - colorDiff(rgba1: RGBA, rgba2: RGBA): number; -} - -export interface Image { - bitmap: Bitmap; -} - -// This must be exported to fix the "index signature missing" error -export interface IllformedPlugin { - class?: never; - constants?: never; - [classFunc: string]: Function -} - -export type DecoderFn = (data: Buffer) => Bitmap -export type EncoderFn = (image: ImageType) => Buffer - -interface WellFormedPlugin { - mime?: { - [MIME_TYPE: string]: string[]; - }; - hasAlpha?: { - [MIME_SPECIAL: string]: boolean; - }; - constants?: { - // Contants to assign to the Jimp instance - [MIME_SPECIAL: string]: any; - }; - decoders?: { - [MIME_TYPE: string]: DecoderFn; - }; - encoders?: { - // Jimp Image - [MIME_TYPE: string]: EncoderFn; - }; - // Extend the Jimp class with the following constants, etc - class?: any; -} - -type ClassOrConstantPlugin = WellFormedPlugin & ( - Required, 'class'>> | Required, 'constants'>> - ); - -// A Jimp type requires mime, but not class -export type JimpType = WellFormedPlugin & Required, 'mime'>>; - -// Jimp plugin either MUST have class OR constant or be illformed -export type JimpPlugin = ClassOrConstantPlugin | IllformedPlugin; - -export type PluginFunction = () => JimpPlugin; -export type TypeFunction = () => JimpType; - -// This is required as providing type arrays gives a union of all the generic -// types in the array rather than an intersection -type UnionToIntersection = - (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never - -// The values to be extracted from a WellFormedPlugin to put onto the Jimp instance -type WellFormedValues = T['class'] & T['constants']; - -// Jimp generic to be able to put plugins and types into, thus allowing -// `configure` from `@jimp/custom` to have proper typings -export type Jimp = - BaseJimp - & UnionToIntersection> - & UnionToIntersection<(P extends WellFormedPlugin ? WellFormedValues

: P)> - -export type GenericCallback = ( - this: TThis, - err: Error | null, - value: T -) => U; - -export type ImageCallback = ( - this: Jimp, - err: Error | null, - value: Jimp, - coords: { - x: number; - y: number; - } -) => U; - -type BlendMode = { - mode: string; - opacitySource: number; - opacityDest: number; -}; - -type ChangeName = 'background' | 'scan' | 'crop'; - -type ListenableName = - | 'any' - | 'initialized' - | 'before-change' - | 'changed' - | 'before-clone' - | 'cloned' - | ChangeName; - -type ListenerData = T extends 'any' - ? any - : T extends ChangeName - ? { - eventName: 'before-change' | 'changed'; - methodName: T; - [key: string]: any; - } - : { - eventName: T; - methodName: T extends 'initialized' - ? 'constructor' - : T extends 'before-change' | 'changed' - ? ChangeName - : T extends 'before-clone' | 'cloned' ? 'clone' : any; - }; - -type URLOptions = { - url: string; - compression?: boolean; - headers: { - [key: string]: any; - }; -}; - -export interface Bitmap { - data: Buffer; - width: number; - height: number; -} - -export interface RGB { - r: number; - g: number; - b: number; -} - -export interface RGBA { - r: number; - g: number; - b: number; - a: number; -} - -export default Jimp; diff --git a/packages/core/package.json b/packages/core/package.json index 006fafc33..95fdc7e72 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -4,7 +4,7 @@ "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", - "types": "index.d.ts", + "types": "types/index.d.ts", "files": [ "dist", "es", diff --git a/packages/core/types/etc.d.ts b/packages/core/types/etc.d.ts new file mode 100644 index 000000000..18b20f6e2 --- /dev/null +++ b/packages/core/types/etc.d.ts @@ -0,0 +1,87 @@ +import {Jimp} from './jimp'; + +export interface Image { + bitmap: Bitmap; +} + +export type DecoderFn = (data: Buffer) => Bitmap; +export type EncoderFn = ( + image: ImageType +) => Buffer; + +export type GenericCallback = ( + this: TThis, + err: Error | null, + value: T +) => U; + +export type ImageCallback = ( + this: Jimp, + err: Error | null, + value: Jimp, + coords: { + x: number; + y: number; + } +) => U; + +type BlendMode = { + mode: string; + opacitySource: number; + opacityDest: number; +}; + +type ChangeName = 'background' | 'scan' | 'crop'; + +type ListenableName = + | 'any' + | 'initialized' + | 'before-change' + | 'changed' + | 'before-clone' + | 'cloned' + | ChangeName; + +type ListenerData = T extends 'any' + ? any + : T extends ChangeName + ? { + eventName: 'before-change' | 'changed'; + methodName: T; + [key: string]: any; + } + : { + eventName: T; + methodName: T extends 'initialized' + ? 'constructor' + : T extends 'before-change' | 'changed' + ? ChangeName + : T extends 'before-clone' | 'cloned' ? 'clone' : any; + }; + +type URLOptions = { + url: string; + compression?: boolean; + headers: { + [key: string]: any; + }; +}; + +export interface Bitmap { + data: Buffer; + width: number; + height: number; +} + +export interface RGB { + r: number; + g: number; + b: number; +} + +export interface RGBA { + r: number; + g: number; + b: number; + a: number; +} diff --git a/packages/core/types/functions.d.ts b/packages/core/types/functions.d.ts new file mode 100644 index 000000000..54eaf5715 --- /dev/null +++ b/packages/core/types/functions.d.ts @@ -0,0 +1,17 @@ +import {Jimp} from './jimp'; + +export function addConstants( + constants: [string, string | number], + jimpInstance?: Jimp +): void; +export function addJimpMethods( + methods: [string, Function], + jimpInstance?: Jimp +): void; +export function jimpEvMethod( + methodName: string, + evName: string, + method: Function +): void; +export function jimpEvChange(methodName: string, method: Function): void; +export function addType(mime: string, extensions: string[]): void; diff --git a/packages/core/types/index.d.ts b/packages/core/types/index.d.ts new file mode 100644 index 000000000..c53d3c251 --- /dev/null +++ b/packages/core/types/index.d.ts @@ -0,0 +1,9 @@ +export * from './etc'; +export * from './functions'; +export * from './plugins'; +export * from './utils'; +import {Jimp} from './jimp'; + +export { Jimp }; +declare const defaultExp: Jimp; +export default defaultExp; diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts new file mode 100644 index 000000000..715977f22 --- /dev/null +++ b/packages/core/types/jimp.d.ts @@ -0,0 +1,189 @@ +import { + Bitmap, + ImageCallback, + URLOptions, + ListenableName, + ListenerData, + GenericCallback, + BlendMode, + RGBA, + RGB +} from './etc'; + +export declare class Jimp { + // Constructors + constructor(path: string, cb?: ImageCallback); + constructor(urlOptions: URLOptions, cb?: ImageCallback); + constructor(image: Jimp, cb?: ImageCallback); + constructor(data: Buffer, cb?: ImageCallback); + constructor(data: Bitmap, cb?: ImageCallback); + constructor(w: number, h: number, cb?: ImageCallback); + constructor( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ); + // For custom constructors when using Jimp.appendConstructorOption + constructor(...args: any[]); + prototype: this; + // Constants + AUTO: -1; + // blend modes + BLEND_SOURCE_OVER: string; + BLEND_DESTINATION_OVER: string; + BLEND_MULTIPLY: string; + BLEND_SCREEN: string; + BLEND_OVERLAY: string; + BLEND_DARKEN: string; + BLEND_LIGHTEN: string; + BLEND_HARDLIGHT: string; + BLEND_DIFFERENCE: string; + BLEND_EXCLUSION: string; + // Align modes for cover, contain, bit masks + HORIZONTAL_ALIGN_LEFT: 1; + HORIZONTAL_ALIGN_CENTER: 2; + HORIZONTAL_ALIGN_RIGHT: 4; + VERTICAL_ALIGN_TOP: 8; + VERTICAL_ALIGN_MIDDLE: 16; + VERTICAL_ALIGN_BOTTOM: 32; + // Edge Handling + EDGE_EXTEND: 1; + EDGE_WRAP: 2; + EDGE_CROP: 3; + // Properties + bitmap: Bitmap; + _rgba: boolean; + _background: number; + _originalMime: string; + // Methods + on( + event: T, + cb: (data: ListenerData) => any + ): any; + parseBitmap( + data: Buffer, + path: string | null | undefined, + cb?: ImageCallback + ): void; + hasAlpha(): boolean; + getHeight(): number; + getWidth(): number; + inspect(): string; + toString(): string; + getMIME(): string; + getExtension(): string; + distanceFromHash(hash: string): number; + write(path: string, cb?: ImageCallback): this; + writeAsync(path: string): Promise; + rgba(bool: boolean, cb?: ImageCallback): this; + getBase64(mime: string, cb: GenericCallback): this; + getBase64Async(mime: string): Promise; + hash(cb?: GenericCallback): string; + hash( + base: number | null | undefined, + cb?: GenericCallback + ): string; + getBuffer(mime: string, cb: GenericCallback): this; + getBufferAsync(mime: string): Promise; + getPixelIndex( + x: number, + y: number, + cb?: GenericCallback + ): number; + getPixelIndex( + x: number, + y: number, + edgeHandling: string, + cb?: GenericCallback + ): number; + getPixelColor( + x: number, + y: number, + cb?: GenericCallback + ): number; + getPixelColour( + x: number, + y: number, + cb?: GenericCallback + ): number; + setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; + setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; + clone(cb?: ImageCallback): this; + cloneQuiet(cb?: ImageCallback): this; + background(hex: number, cb?: ImageCallback): this; + backgroundQuiet(hex: number, cb?: ImageCallback): this; + scan( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: ImageCallback + ): this; + scanQuiet( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: ImageCallback + ): this; + scanIterator( + x: number, + y: number, + w: number, + h: number + ): IterableIterator<{ x: number; y: number; idx: number; image: Jimp }>; + + // Effect methods + composite( + src: Jimp, + x: number, + y: number, + options?: BlendMode, + cb?: ImageCallback + ): this; + + // Functions + appendConstructorOption( + name: string, + test: (...args: T[]) => boolean, + run: ( + this: Jimp, + resolve: (jimp: Jimp) => any, + reject: (reason: Error) => any, + ...args: T[] + ) => any + ): void; + read(path: string): Promise; + read(image: Jimp): Promise; + read(data: Buffer): Promise; + read(w: number, h: number, background?: number | string): Promise; + create(path: string): Promise; + create(image: Jimp): Promise; + create(data: Buffer): Promise; + create(w: number, h: number, background?: number | string): Promise; + rgbaToInt( + r: number, + g: number, + b: number, + a: number, + cb: GenericCallback + ): number; + intToRGBA(i: number, cb?: GenericCallback): RGBA; + cssColorToHex(cssColor: string): number; + limit255(n: number): number; + diff( + img1: Jimp, + img2: Jimp, + threshold?: number + ): { + percent: number; + image: Jimp; + }; + distance(img1: Jimp, img2: Jimp): number; + compareHashes(hash1: string, hash2: string): number; + colorDiff(rgba1: RGB, rgba2: RGB): number; + colorDiff(rgba1: RGBA, rgba2: RGBA): number; +} diff --git a/packages/core/types/plugins.d.ts b/packages/core/types/plugins.d.ts new file mode 100644 index 000000000..e5867d17c --- /dev/null +++ b/packages/core/types/plugins.d.ts @@ -0,0 +1,57 @@ +/** + * These files pertain to the typings of plugins or types + * + * They're not meant as utils to decode types, but rather + * the type definitons themsleves for plugins and types of various kinds + */ +import { + Image, + EncoderFn, + DecoderFn +} from './etc'; + +import { + Omit +} from './utils'; + +export type IllformedPlugin = Omit & { + class?: never; + constants?: never; +} + +export interface WellFormedPlugin { + mime?: { + [MIME_TYPE: string]: string[]; + }; + hasAlpha?: { + [MIME_SPECIAL: string]: boolean; + }; + constants?: { + // Contants to assign to the Jimp instance + [MIME_SPECIAL: string]: any; + }; + decoders?: { + [MIME_TYPE: string]: DecoderFn; + }; + encoders?: { + // Jimp Image + [MIME_TYPE: string]: EncoderFn; + }; + // Extend the Jimp class with the following constants, etc + class?: any; +} + +type ClassOrConstantPlugin = WellFormedPlugin & + ( + | Required, 'class'>> + | Required, 'constants'>> + ); + +// A Jimp type requires mime, but not class +export type JimpType = WellFormedPlugin & + Required, 'mime'>>; + +// Jimp plugin either MUST have class OR constant or be illformed +export type JimpPlugin = + | ClassOrConstantPlugin + | IllformedPlugin; diff --git a/packages/core/types/utils.d.ts b/packages/core/types/utils.d.ts new file mode 100644 index 000000000..fa773bce1 --- /dev/null +++ b/packages/core/types/utils.d.ts @@ -0,0 +1,54 @@ +import { + WellFormedPlugin, + JimpType, + JimpPlugin, +} from './plugins'; + +// This is required as providing type arrays gives a union of all the generic +// types in the array rather than an intersection +export type UnionToIntersection = + (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never; + +/** + * The values to be extracted from a WellFormedPlugin to put onto the Jimp instance + * Left loose as "any" in order to enable the GetPluginValue to work properly + */ +export type WellFormedValues = + T['class'] & + T['constants']; + +// Util type for the functions that deal with `@jimp/custom` +// Must accept any or no props thanks to typing of the `plugins` intersected function +export type FunctionRet = Array<(...props: any[] | never) => T>; + +/** + * This conditional cannot be flipped. TS assumes that Q is `WellFormed` even + * it does not have the `class` or `constant` props. As a result, it will end + * up `undefined`. Because we're always extending `IllformedPlugin` on the + * plugins, this should work fine + */ +export type GetPluginVal = Q extends Required<{class: any}> | Required<{constant: any}> + ? WellFormedValues + : Q; + +type GetPluginFuncArrValues = + // Given an array of types infer `Q` (Q should be the type value) + PluginFuncArr extends Array<() => infer Q> + ? // Get the plugin value, may be ill-formed or well-formed + GetPluginVal + : // This should never be reached + undefined; + +/** + * A helper type to get the values to be intersected with `Jimp` to give + * the proper typing given an array of functions for plugins and types + */ +export type GetIntersectionFromPlugins< + PluginFuncArr extends FunctionRet +> = UnionToIntersection>; + +/** + * While this was added to TS 3.5, in order to support down to TS 2.8, we need + * to export this and use it in sub-packges that utilize it + */ +export type Omit = Pick>; diff --git a/packages/custom/index.d.ts b/packages/custom/index.d.ts deleted file mode 100644 index 2413bb64a..000000000 --- a/packages/custom/index.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { - Jimp, - JimpPlugin, - JimpType, - TypeFunction, - PluginFunction -} from '@jimp/core'; - -export default function configure(configuration: { - types?: TypeFunction[], - plugins?: PluginFunction[] -}, jimpInstance?: JimpInst): JimpInst & Jimp; diff --git a/packages/custom/package.json b/packages/custom/package.json index d02cf25ab..c359e3928 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -4,7 +4,7 @@ "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", - "types": "index.d.ts", + "types": "types/index.d.ts", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/custom/types/index.d.ts b/packages/custom/types/index.d.ts new file mode 100644 index 000000000..5ae06a01b --- /dev/null +++ b/packages/custom/types/index.d.ts @@ -0,0 +1,48 @@ +// TypeScript Version: 3.1 +// See the `jimp` package index.d.ts for why the version is not 2.8 +import { + FunctionRet, + Jimp, + JimpPlugin, + JimpType, + GetIntersectionFromPlugins +} from '@jimp/core'; + +declare function configure< + PluginFuncArr extends FunctionRet, + JimpInstance extends Jimp = Jimp +>( + configuration: { + plugins: PluginFuncArr; + }, + jimpInstance?: JimpInstance +): Exclude & + GetIntersectionFromPlugins; + +declare function configure< + TypesFuncArr extends FunctionRet, + JimpInstance extends Jimp = Jimp +>( + configuration: { + types: TypesFuncArr; + }, + jimpInstance?: JimpInstance +): Exclude & + GetIntersectionFromPlugins; + +declare function configure< + TypesFuncArr extends FunctionRet, + PluginFuncArr extends FunctionRet, + JimpInstance extends Jimp = Jimp +>( + configuration: { + types?: TypesFuncArr; + plugins?: PluginFuncArr; + }, + jimpInstance?: JimpInstance + // Since JimpInstance is required, we want to use the default `Jimp` type +): Exclude & + GetIntersectionFromPlugins & + GetIntersectionFromPlugins; + + export default configure; diff --git a/packages/custom/types/test.ts b/packages/custom/types/test.ts new file mode 100644 index 000000000..3cf91dfe8 --- /dev/null +++ b/packages/custom/types/test.ts @@ -0,0 +1,152 @@ +import configure from '@jimp/custom'; +import gif from '@jimp/gif'; +import png from '@jimp/png'; +import displace from '@jimp/plugin-displace'; +import resize from '@jimp/plugin-resize'; +import scale from '@jimp/plugin-scale'; +import types from '@jimp/types'; +import plugins from '@jimp/plugins'; + +// configure should return a valid Jimp type with addons +const CustomJimp = configure({ + types: [gif, png], + plugins: [displace, resize] +}); + +// Methods from types should be applied +CustomJimp.deflateLevel(4); +// Constants from types should be applied +// $ExpectType 0 +CustomJimp.PNG_FILTER_NONE; + +// Core functions should still work from Jimp +CustomJimp.read('Test'); + +// Constants should be applied from ill-formed plugins +CustomJimp.displace(CustomJimp, 2); + +// Methods should be applied from well-formed plugins +CustomJimp.resize(40, 40) + +// Constants should be applied from well-formed plugins +CustomJimp.RESIZE_NEAREST_NEIGHBOR + +// $ExpectError +CustomJimp.test; + +// $ExpectError +CustomJimp.func(); + +test('can compose', () => { + const OtherCustomJimp = configure({ + plugins: [scale] + }, CustomJimp); + + // Methods from new plugins should be applied + OtherCustomJimp.scale(3); + + // Methods from types should be applied + OtherCustomJimp.filterType(4); + // Constants from types should be applied + // $ExpectType 0 + OtherCustomJimp.PNG_FILTER_NONE; + + // Core functions should still work from Jimp + OtherCustomJimp.read('Test'); + + // Constants should be applied from ill-formed plugins + OtherCustomJimp.displace(OtherCustomJimp, 2); + + // Methods should be applied from well-formed plugins + OtherCustomJimp.resize(40, 40); + + // Constants should be applied from well-formed plugins + OtherCustomJimp.RESIZE_NEAREST_NEIGHBOR; + + // $ExpectError + OtherCustomJimp.test; + + // $ExpectError + OtherCustomJimp.func(); +}); + +test('can handle only plugins', () => { + const PluginsJimp = configure({ + plugins: [plugins] + }); + + // Core functions should still work from Jimp + PluginsJimp.read('Test'); + + // Constants should be applied from ill-formed plugins + PluginsJimp.displace(PluginsJimp, 2); + + // Methods should be applied from well-formed plugins + PluginsJimp.resize(40, 40); + + // Constants should be applied from well-formed plugins + // $ExpectType "nearestNeighbor" + PluginsJimp.RESIZE_NEAREST_NEIGHBOR; + + // $ExpectError + PluginsJimp.test; + + // $ExpectError + PluginsJimp.func(); +}) + +test('can handle only all types', () => { + const TypesJimp = configure({ + types: [types] + }); + + // Methods from types should be applied + TypesJimp.filterType(4); + // Constants from types should be applied + // Commented for complexity errors + // $ExpectType 0 + TypesJimp.PNG_FILTER_NONE; + + // $ExpectError + TypesJimp.test; + + // $ExpectError + TypesJimp.func(); +}); + +test('can handle only one type', () => { + const PngJimp = configure({ + types: [png] + }); + + // Constants from types should be applied + // Commented for complexity errors + // $ExpectType 0 + PngJimp.PNG_FILTER_NONE; + + // $ExpectError + PngJimp.test; + + // $ExpectError + PngJimp.func(); +}); + + +test('can handle only one plugin', () => { + const PngJimp = configure({ + plugins: [resize] + }); + + // Constants from types should be applied + // Commented for complexity errors + // $ExpectType "nearestNeighbor" + PngJimp.RESIZE_NEAREST_NEIGHBOR; + + PngJimp.resize(2, 2); + + // $ExpectError + PngJimp.test; + + // $ExpectError + PngJimp.func(); +}); diff --git a/packages/custom/types/tsconfig.json b/packages/custom/types/tsconfig.json new file mode 100644 index 000000000..dcfe450fd --- /dev/null +++ b/packages/custom/types/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": ["es6"], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "noEmit": true, + + // If the library is an external module (uses `export`), this allows your test file to import "mylib" instead of "./index". + // If the library is global (cannot be imported via `import` or `require`), leave this out. + "baseUrl": ".", + "paths": { + "mylib": ["."] + } + } +} diff --git a/packages/jimp/index.d.ts b/packages/jimp/index.d.ts deleted file mode 100644 index 6256448a8..000000000 --- a/packages/jimp/index.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { - Jimp as JimpType, - Bitmap, - RGB, - RGBA -} from '@jimp/core'; -import typeFn from '@jimp/types'; -import pluginFn from '@jimp/plugins'; - -type Types = ReturnType; -type Plugins = ReturnType; - -declare const Jimp: JimpType; -export default Jimp; - -export { - Bitmap, - RGB, - RGBA -} - -export { - FontChar, - FontInfo, - FontCommon, - Font -} from '@jimp/plugin-print'; diff --git a/packages/jimp/package.json b/packages/jimp/package.json index a58ae3b71..24b4f4a42 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -5,7 +5,14 @@ "main": "dist/index.js", "module": "es/index.js", "browser": "browser/lib/jimp.js", - "types": "index.d.ts", + "types": "types/index.d.ts", + "typesVersions": { + ">=3.1.0-0": { + "*": [ + "types/ts3.1/index.d.ts" + ] + } + }, "tonicExampleFilename": "example.js", "files": [ "browser", diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts new file mode 100644 index 000000000..74f0dc9da --- /dev/null +++ b/packages/jimp/types/index.d.ts @@ -0,0 +1,590 @@ +// TypeScript Version: 2.8 + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +declare class Jimp { + // Constructors + constructor(path: string, cb?: ImageCallback); + constructor(urlOptions: URLOptions, cb?: ImageCallback); + constructor(image: Jimp, cb?: ImageCallback); + constructor(data: Buffer | Bitmap, cb?: ImageCallback); + constructor(w: number, h: number, cb?: ImageCallback); + constructor( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ); + // For custom constructors when using Jimp.appendConstructorOption + constructor(...args: any[]); + prototype: Jimp; + + // Constants + AUTO: -1; + + // supported mime types + MIME_PNG: 'image/png'; + MIME_TIFF: 'image/tiff'; + MIME_JPEG: 'image/jpeg'; + MIME_JGD: 'image/jgd'; + MIME_BMP: 'image/bmp'; + MIME_X_MS_BMP: 'image/x-ms-bmp'; + MIME_GIF: 'image/gif'; + // PNG filter types + PNG_FILTER_AUTO: -1; + PNG_FILTER_NONE: 0; + PNG_FILTER_SUB: 1; + PNG_FILTER_UP: 2; + PNG_FILTER_AVERAGE: 3; + PNG_FILTER_PATH: 4; + + // resize methods + RESIZE_NEAREST_NEIGHBOR: 'nearestNeighbor'; + RESIZE_BILINEAR: 'bilinearInterpolation'; + RESIZE_BICUBIC: 'bicubicInterpolation'; + RESIZE_HERMITE: 'hermiteInterpolation'; + RESIZE_BEZIER: 'bezierInterpolation'; + + // blend modes + BLEND_SOURCE_OVER: string; + BLEND_DESTINATION_OVER: string; + BLEND_MULTIPLY: string; + BLEND_SCREEN: string; + BLEND_OVERLAY: string; + BLEND_DARKEN: string; + BLEND_LIGHTEN: string; + BLEND_HARDLIGHT: string; + BLEND_DIFFERENCE: string; + BLEND_EXCLUSION: string; + + // Align modes for cover, contain, bit masks + HORIZONTAL_ALIGN_LEFT: 1; + HORIZONTAL_ALIGN_CENTER: 2; + HORIZONTAL_ALIGN_RIGHT: 4; + + VERTICAL_ALIGN_TOP: 8; + VERTICAL_ALIGN_MIDDLE: 16; + VERTICAL_ALIGN_BOTTOM: 32; + + // Font locations + FONT_SANS_8_BLACK: string; + FONT_SANS_10_BLACK: string; + FONT_SANS_12_BLACK: string; + FONT_SANS_14_BLACK: string; + FONT_SANS_16_BLACK: string; + FONT_SANS_32_BLACK: string; + FONT_SANS_64_BLACK: string; + FONT_SANS_128_BLACK: string; + + FONT_SANS_8_WHITE: string; + FONT_SANS_16_WHITE: string; + FONT_SANS_32_WHITE: string; + FONT_SANS_64_WHITE: string; + FONT_SANS_128_WHITE: string; + + // Edge Handling + EDGE_EXTEND: 1; + EDGE_WRAP: 2; + EDGE_CROP: 3; + + // Properties + bitmap: Bitmap; + + _quality: number; + _deflateLevel: number; + _deflateStrategy: number; + _filterType: number; + _rgba: boolean; + _background: number; + _originalMime: string; + + // Methods + on( + event: T, + cb: (data: ListenerData) => any + ): any; + parseBitmap( + data: Buffer, + path: string | null | undefined, + cb?: ImageCallback + ): void; + hasAlpha(): boolean; + getHeight(): number; + getWidth(): number; + inspect(): string; + toString(): string; + getMIME(): string; + getExtension(): string; + distanceFromHash(hash: string): number; + write(path: string, cb?: ImageCallback): this; + writeAsync(path: string): Promise; + deflateLevel(l: number, cb?: ImageCallback): this; + deflateStrategy(s: number, cb?: ImageCallback): this; + colorType(s: number, cb?: ImageCallback): this; + filterType(f: number, cb?: ImageCallback): this; + rgba(bool: boolean, cb?: ImageCallback): this; + quality(n: number, cb?: ImageCallback): this; + getBase64(mime: string, cb: GenericCallback): this; + getBase64Async(mime: string): Promise; + hash(cb?: GenericCallback): string; + hash( + base: number | null | undefined, + cb?: GenericCallback + ): string; + getBuffer(mime: string, cb: GenericCallback): this; + getBufferAsync(mime: string): Promise; + getPixelIndex( + x: number, + y: number, + cb?: GenericCallback + ): number; + getPixelIndex( + x: number, + y: number, + edgeHandling: string, + cb?: GenericCallback + ): number; + getPixelColor( + x: number, + y: number, + cb?: GenericCallback + ): number; + getPixelColour( + x: number, + y: number, + cb?: GenericCallback + ): number; + setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; + setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; + clone(cb?: ImageCallback): this; + cloneQuiet(cb?: ImageCallback): this; + background(hex: number, cb?: ImageCallback): this; + backgroundQuiet(hex: number, cb?: ImageCallback): this; + scan( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: ImageCallback + ): this; + scanQuiet( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: ImageCallback + ): this; + scanIterator( + x: number, + y: number, + w: number, + h: number + ): IterableIterator<{ x: number; y: number; idx: number; image: Jimp }>; + crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): this; + cropQuiet( + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): this; + + // Color methods + brightness(val: number, cb?: ImageCallback): this; + contrast(val: number, cb?: ImageCallback): this; + posterize(n: number, cb?: ImageCallback): this; + greyscale(cb?: ImageCallback): this; + grayscale(cb?: ImageCallback): this; + opacity(f: number, cb?: ImageCallback): this; + sepia(cb?: ImageCallback): this; + fade(f: number, cb?: ImageCallback): this; + convolution(kernel: number[][], cb?: ImageCallback): this; + convolution( + kernel: number[][], + edgeHandling: string, + cb?: ImageCallback + ): this; + opaque(cb?: ImageCallback): this; + pixelate(size: number, cb?: ImageCallback): this; + pixelate( + size: number, + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): this; + convolute(kernel: number[][], cb?: ImageCallback): this; + convolute( + kernel: number[][], + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): this; + color(actions: ColorAction[], cb?: ImageCallback): this; + colour(actions: ColorAction[], cb?: ImageCallback): this; + + // Shape methods + rotate(deg: number, cb?: ImageCallback): this; + rotate(deg: number, mode: string | boolean, cb?: ImageCallback): this; + flip(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; + mirror(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; + resize(w: number, h: number, cb?: ImageCallback): this; + resize(w: number, h: number, mode?: string, cb?: ImageCallback): this; + cover(w: number, h: number, cb?: ImageCallback): this; + cover(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; + cover( + w: number, + h: number, + alignBits?: number, + mode?: string, + cb?: ImageCallback + ): this; + contain(w: number, h: number, cb?: ImageCallback): this; + contain(w: number, h: number, mode?: string, cb?: ImageCallback): this; + contain(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; + contain( + w: number, + h: number, + alignBits?: number, + mode?: string, + cb?: ImageCallback + ): this; + scale(f: number, cb?: ImageCallback): this; + scale(f: number, mode?: string, cb?: ImageCallback): this; + scaleToFit(w: number, h: number, cb?: ImageCallback): this; + scaleToFit(w: number, h: number, mode?: string, cb?: ImageCallback): this; + displace(map: Jimp, offset: number, cb?: ImageCallback): this; + autocrop(tolerance?: number, cb?: ImageCallback): this; + autocrop(cropOnlyFrames?: boolean, cb?: ImageCallback): this; + autocrop( + tolerance?: number, + cropOnlyFrames?: boolean, + cb?: ImageCallback + ): this; + autocrop( + options: { + tolerance?: number; + cropOnlyFrames?: boolean; + cropSymmetric?: boolean; + leaveBorder?: number; + }, + cb?: ImageCallback + ): this; + + // Text methods + print( + font: Font, + x: number, + y: number, + text: PrintableText, + cb?: ImageCallback + ): this; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + cb?: ImageCallback + ): this; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + maxHeight?: number, + cb?: ImageCallback + ): this; + + // Effect methods + blur(r: number, cb?: ImageCallback): this; + dither565(cb?: ImageCallback): this; + dither16(cb?: ImageCallback): this; + histogram(): { + r: number[]; + g: number[]; + b: number[]; + }; + normalize(cb?: ImageCallback): this; + invert(cb?: ImageCallback): this; + gaussian(r: number, cb?: ImageCallback): this; + composite( + src: Jimp, + x: number, + y: number, + options?: BlendMode, + cb?: ImageCallback + ): this; + blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + blit( + src: Jimp, + x: number, + y: number, + srcx: number, + srcy: number, + srcw: number, + srch: number, + cb?: ImageCallback + ): this; + mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + + // Functions + appendConstructorOption( + name: string, + test: (...args: T[]) => boolean, + run: ( + this: Jimp, + resolve: (jimp: Jimp) => any, + reject: (reason: Error) => any, + ...args: T[] + ) => any + ): void; + read(path: string): Promise; + read(image: Jimp): Promise; + read(data: Buffer): Promise; + read(w: number, h: number, background?: number | string): Promise; + create(path: string): Promise; + create(image: Jimp): Promise; + create(data: Buffer): Promise; + create(w: number, h: number, background?: number | string): Promise; + rgbaToInt( + r: number, + g: number, + b: number, + a: number, + cb: GenericCallback + ): number; + intToRGBA(i: number, cb?: GenericCallback): RGBA; + cssColorToHex(cssColor: string): number; + limit255(n: number): number; + diff( + img1: Jimp, + img2: Jimp, + threshold?: number + ): { + percent: number; + image: Jimp; + }; + distance(img1: Jimp, img2: Jimp): number; + compareHashes(hash1: string, hash2: string): number; + colorDiff(rgba1: RGB, rgba2: RGB): number; + colorDiff(rgba1: RGBA, rgba2: RGBA): number; + loadFont(file: string): Promise; + loadFont(file: string, cb: GenericCallback): Promise; + measureText(font: Font, text: PrintableText): number; + measureTextHeight(font: Font, text: PrintableText, maxWidth: number): number; + circle( + options?: { + radius: number; + x: number; + y: number; + }, + cb?: ImageCallback + ): this; + circle(cb?: ImageCallback): this; + fishEye(opts?: { r: number }, cb?: ImageCallback): this; + fishEye(cb?: ImageCallback): this; + shadow( + options?: { + size?: number; + opacity?: number; + x?: number; + y?: number; + }, + cb?: ImageCallback + ): this; + shadow(cb?: ImageCallback): this; + threshold( + opts: { + max: number; + replace?: number; + autoGreyscale?: boolean; + }, + cb?: ImageCallback + ): this; +} + +declare const JimpInst: Jimp; + +export default JimpInst; + +type GenericCallback = ( + this: TThis, + err: Error | null, + value: T +) => U; + +type ImageCallback = ( + this: Jimp, + err: Error | null, + value: Jimp, + coords: { + x: number; + y: number; + } +) => U; + +type ColorActionName = + | 'mix' + | 'tint' + | 'shade' + | 'xor' + | 'red' + | 'green' + | 'blue' + | 'hue'; + +type ColorAction = { + apply: ColorActionName; + params: any; +}; + +type BlendMode = { + mode: string; + opacitySource: number; + opacityDest: number; +}; + +type ChangeName = 'background' | 'scan' | 'crop'; + +type ListenableName = + | 'any' + | 'initialized' + | 'before-change' + | 'changed' + | 'before-clone' + | 'cloned' + | ChangeName; + +type ListenerData = T extends 'any' + ? any + : T extends ChangeName + ? { + eventName: 'before-change' | 'changed'; + methodName: T; + [key: string]: any; + } + : { + eventName: T; + methodName: T extends 'initialized' + ? 'constructor' + : T extends 'before-change' | 'changed' + ? ChangeName + : T extends 'before-clone' | 'cloned' ? 'clone' : any; + }; + +type PrintableText = + | any + | { + text: string; + alignmentX: number; + alignmentY: number; + }; + +type URLOptions = { + url: string; + compression?: boolean; + headers: { + [key: string]: any; + }; +}; + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface Bitmap { + data: Buffer; + width: number; + height: number; +} +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface RGB { + r: number; + g: number; + b: number; +} + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface RGBA { + r: number; + g: number; + b: number; + a: number; +} + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface FontChar { + id: number; + x: number; + y: number; + width: number; + height: number; + xoffset: number; + yoffset: number; + xadvance: number; + page: number; + chnl: number; +} + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface FontInfo { + face: string; + size: number; + bold: number; + italic: number; + charset: string; + unicode: number; + stretchH: number; + smooth: number; + aa: number; + padding: [number, number, number, number]; + spacing: [number, number]; +} + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface FontCommon { + lineHeight: number; + base: number; + scaleW: number; + scaleH: number; + pages: number; + packed: number; + alphaChnl: number; + redChnl: number; + greenChnl: number; + blueChnl: number; +} + +/** + * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version + */ +export interface Font { + chars: { + [char: string]: FontChar; + }; + kernings: { + [firstString: string]: { + [secondString: string]: number; + }; + }; + pages: string[]; + common: FontCommon; + info: FontInfo; +} diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts new file mode 100644 index 000000000..67220b5c7 --- /dev/null +++ b/packages/jimp/types/test.ts @@ -0,0 +1,14 @@ +import Jimp from 'jimp'; + +// Main Jimp export should already have all of these already applied +Jimp.read('Test'); +Jimp.displace(Jimp, 2); +Jimp.resize(40, 40); +// $ExpectType 0 +Jimp.PNG_FILTER_NONE; + +// $ExpectError +Jimp.test; + +// $ExpectError +Jimp.func(); diff --git a/packages/jimp/types/ts3.1/index.d.ts b/packages/jimp/types/ts3.1/index.d.ts new file mode 100644 index 000000000..8125aeb7b --- /dev/null +++ b/packages/jimp/types/ts3.1/index.d.ts @@ -0,0 +1,29 @@ +/** + * While there is nothing in these typings that prevent it from running in TS 2.8 even, + * due to the complexity of the typings anything lower than TS 3.1 will only see + * Jimp as `any`. In order to test the strict versions of these types in our typing + * test suite, the version has been bumped to 3.1 + */ + +import { + Jimp as JimpType, + Bitmap, + RGB, + RGBA, + WellFormedValues, + UnionToIntersection, + GetPluginVal +} from '@jimp/core'; +import typeFn from '@jimp/types'; +import pluginFn from '@jimp/plugins'; + +type Types = ReturnType; +type Plugins = ReturnType; + +export { Bitmap, RGB, RGBA }; + +export { FontChar, FontInfo, FontCommon, Font } from '@jimp/plugin-print'; + +export type FullJimpType = JimpType & UnionToIntersection> & UnionToIntersection>; +declare const Jimp: FullJimpType; +export default Jimp; diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts new file mode 100644 index 000000000..67220b5c7 --- /dev/null +++ b/packages/jimp/types/ts3.1/test.ts @@ -0,0 +1,14 @@ +import Jimp from 'jimp'; + +// Main Jimp export should already have all of these already applied +Jimp.read('Test'); +Jimp.displace(Jimp, 2); +Jimp.resize(40, 40); +// $ExpectType 0 +Jimp.PNG_FILTER_NONE; + +// $ExpectError +Jimp.test; + +// $ExpectError +Jimp.func(); diff --git a/packages/jimp/types/ts3.1/tsconfig.json b/packages/jimp/types/ts3.1/tsconfig.json new file mode 100644 index 000000000..6dbbf36d9 --- /dev/null +++ b/packages/jimp/types/ts3.1/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": ["es6"], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "noEmit": true, + + // If the library is an external module (uses `export`), this allows your test file to import "mylib" instead of "./index". + // If the library is global (cannot be imported via `import` or `require`), leave this out. + "baseUrl": "../test", + "paths": { + "mylib": ["."] + } + } +} diff --git a/packages/jimp/types/tsconfig.json b/packages/jimp/types/tsconfig.json new file mode 100644 index 000000000..6dbbf36d9 --- /dev/null +++ b/packages/jimp/types/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": ["es6"], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "noEmit": true, + + // If the library is an external module (uses `export`), this allows your test file to import "mylib" instead of "./index". + // If the library is global (cannot be imported via `import` or `require`), leave this out. + "baseUrl": "../test", + "paths": { + "mylib": ["."] + } + } +} diff --git a/packages/plugin-blit/index.d.ts b/packages/plugin-blit/index.d.ts index d62d0c577..583128019 100644 --- a/packages/plugin-blit/index.d.ts +++ b/packages/plugin-blit/index.d.ts @@ -1,6 +1,6 @@ import { Jimp, ImageCallback, IllformedPlugin } from '@jimp/core'; -interface Blit extends IllformedPlugin { +interface Blit { blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; blit( src: Jimp, diff --git a/packages/plugin-blur/index.d.ts b/packages/plugin-blur/index.d.ts index e8c8b7e74..d40ab0e5a 100644 --- a/packages/plugin-blur/index.d.ts +++ b/packages/plugin-blur/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Blur extends IllformedPlugin { +interface Blur { blur(r: number, cb?: ImageCallback): this; } diff --git a/packages/plugin-color/index.d.ts b/packages/plugin-color/index.d.ts index b77e925ad..241903a44 100644 --- a/packages/plugin-color/index.d.ts +++ b/packages/plugin-color/index.d.ts @@ -1,4 +1,4 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; type ColorActionName = | 'mix' @@ -15,7 +15,7 @@ type ColorAction = { params: any; }; -interface Color extends IllformedPlugin { +interface Color { brightness(val: number, cb?: ImageCallback): this; contrast(val: number, cb?: ImageCallback): this; posterize(n: number, cb?: ImageCallback): this; diff --git a/packages/plugin-contain/index.d.ts b/packages/plugin-contain/index.d.ts index 517e2fa1f..06d9e288a 100644 --- a/packages/plugin-contain/index.d.ts +++ b/packages/plugin-contain/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Contain extends IllformedPlugin { +interface Contain { contain(w: number, h: number, cb?: ImageCallback): this; contain(w: number, h: number, mode?: string, cb?: ImageCallback): this; contain(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; diff --git a/packages/plugin-cover/index.d.ts b/packages/plugin-cover/index.d.ts index 114c86642..4a50f175a 100644 --- a/packages/plugin-cover/index.d.ts +++ b/packages/plugin-cover/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Cover extends IllformedPlugin { +interface Cover { cover(w: number, h: number, cb?: ImageCallback): this; cover(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; cover( diff --git a/packages/plugin-displace/index.d.ts b/packages/plugin-displace/index.d.ts index ae8a90e2d..e2634b65d 100644 --- a/packages/plugin-displace/index.d.ts +++ b/packages/plugin-displace/index.d.ts @@ -1,6 +1,6 @@ import { Jimp, ImageCallback, IllformedPlugin } from '@jimp/core'; -interface Displace extends IllformedPlugin { +interface Displace { displace(map: Jimp, offset: number, cb?: ImageCallback): this; } diff --git a/packages/plugin-dither/index.d.ts b/packages/plugin-dither/index.d.ts index 3b03b7413..34d40b0b3 100644 --- a/packages/plugin-dither/index.d.ts +++ b/packages/plugin-dither/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Dither extends IllformedPlugin { +interface Dither { dither565(cb?: ImageCallback): this; dither16(cb?: ImageCallback): this; } diff --git a/packages/plugin-flip/index.d.ts b/packages/plugin-flip/index.d.ts index 01e072ff9..24eef6765 100644 --- a/packages/plugin-flip/index.d.ts +++ b/packages/plugin-flip/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Flip extends IllformedPlugin { +interface Flip { flip(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; mirror(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; } diff --git a/packages/plugin-gaussian/index.d.ts b/packages/plugin-gaussian/index.d.ts index 011f3eeef..8c91fbbf6 100644 --- a/packages/plugin-gaussian/index.d.ts +++ b/packages/plugin-gaussian/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Gaussian extends IllformedPlugin { +interface Gaussian { gaussian(r: number, cb?: ImageCallback): this; } diff --git a/packages/plugin-invert/index.d.ts b/packages/plugin-invert/index.d.ts index 57fa40dbc..89423ae40 100644 --- a/packages/plugin-invert/index.d.ts +++ b/packages/plugin-invert/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Invert extends IllformedPlugin { +interface Invert { invert(cb?: ImageCallback): this; } diff --git a/packages/plugin-mask/index.d.ts b/packages/plugin-mask/index.d.ts index b8d4ea106..fb4360f9c 100644 --- a/packages/plugin-mask/index.d.ts +++ b/packages/plugin-mask/index.d.ts @@ -1,6 +1,6 @@ import { IllformedPlugin, ImageCallback, Jimp } from '@jimp/core'; -interface Mask extends IllformedPlugin { +interface Mask { mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; } diff --git a/packages/plugin-normalize/index.d.ts b/packages/plugin-normalize/index.d.ts index 105d639be..a140288cf 100644 --- a/packages/plugin-normalize/index.d.ts +++ b/packages/plugin-normalize/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Normalize extends IllformedPlugin { +interface Normalize { normalize(cb ?: ImageCallback): this; } diff --git a/packages/plugin-rotate/index.d.ts b/packages/plugin-rotate/index.d.ts index 771dabe3b..2528e252c 100644 --- a/packages/plugin-rotate/index.d.ts +++ b/packages/plugin-rotate/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Rotate extends IllformedPlugin { +interface Rotate { rotate(deg: number, cb?: ImageCallback): this; rotate(deg: number, mode: string | boolean, cb?: ImageCallback): this; } diff --git a/packages/plugin-scale/index.d.ts b/packages/plugin-scale/index.d.ts index ac04589c6..06176a1bf 100644 --- a/packages/plugin-scale/index.d.ts +++ b/packages/plugin-scale/index.d.ts @@ -1,6 +1,6 @@ -import { IllformedPlugin, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Scale extends IllformedPlugin { +interface Scale { scale(f: number, cb?: ImageCallback): this; scale(f: number, mode?: string, cb?: ImageCallback): this; scaleToFit(w: number, h: number, cb?: ImageCallback): this; diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 8079db2dd..979b07707 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -25,8 +25,8 @@ }, "peerDependencies": { "@jimp/custom": ">=0.3.5", - "@jimp/plugin-color": "^0.6.3", - "@jimp/plugin-resize": "^0.6.3" + "@jimp/plugin-color": "^0.8.0", + "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { "@jimp/custom": "^0.8.0", diff --git a/packages/plugins/index.d.ts b/packages/plugins/index.d.ts index 66a8f0928..6dcfab7bd 100644 --- a/packages/plugins/index.d.ts +++ b/packages/plugins/index.d.ts @@ -60,4 +60,4 @@ type Plugins = DitherRet | ContainRet | CoverRet; -export default function(jimpEvChange: any): Plugins; +export default function(): Plugins; diff --git a/packages/utils/index.d.ts b/packages/utils/index.d.ts index f4eb2edcf..79fbeaa46 100644 --- a/packages/utils/index.d.ts +++ b/packages/utils/index.d.ts @@ -1,4 +1,4 @@ -import { Image } from './../../types/src/index.d'; +import { Image, Omit } from '@jimp/core'; import { ThrowStatement } from 'typescript'; export function isNodePattern(cb: Function): true; diff --git a/yarn.lock b/yarn.lock index 4a983c7a1..362b515ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1625,9 +1625,15 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c" integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg== +"@types/parsimmon@^1.3.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.0.tgz#ffb81cb023ff435a41d4710a29ab23c561dc9fdf" + integrity sha512-bsTIJFVQv7jnvNiC42ld2pQW2KRI+pAG243L+iATvqzy3X6+NH1obz2itRKDZZ8VVhN3wjwYax/VBGCcXzgTqQ== + "@types/yargs@^11.1.1": - version "11.1.1" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.1.tgz#2e724257167fd6b615dbe4e54301e65fe597433f" + version "11.1.2" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.2.tgz#fd4b676846fe731a5de5c6d2e5ef6a377262fc30" + integrity sha512-zG61PAp2OcoIBjRV44wftJj6AJgzJrOc32LCYOBqk9bdgcdzK5DCJHV9QZJ60+Fu+fOn79g8Ks3Gixm4CfkZ+w== JSONStream@^1.0.3: version "1.3.3" @@ -1893,6 +1899,7 @@ array-slice@^0.2.3: array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" + integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= dependencies: array-uniq "^1.0.1" @@ -2005,6 +2012,15 @@ aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" +babel-code-frame@^6.22.0: + version "6.26.0" + resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" + integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + dependencies: + chalk "^1.1.3" + esutils "^2.0.2" + js-tokens "^3.0.2" + babel-eslint@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220" @@ -2399,7 +2415,7 @@ buffer@^5.0.2, buffer@^5.2.0: base64-js "^1.0.2" ieee754 "^1.1.4" -builtin-modules@^1.0.0: +builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -2838,6 +2854,11 @@ commander@2.15.1: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" +commander@^2.12.1, commander@~2.20.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== + commander@^2.14.1, commander@^2.8.1, commander@^2.9.0: version "2.16.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50" @@ -2846,11 +2867,6 @@ commander@~2.17.1: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" -commander@~2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -3275,7 +3291,7 @@ decamelize-keys@^1.0.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2: +decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -3359,6 +3375,22 @@ defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" +definitelytyped-header-parser@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/definitelytyped-header-parser/-/definitelytyped-header-parser-1.2.0.tgz#f21374b8a18fabcd3ba4b008a0bcbc9db2b7b4c4" + integrity sha512-xpg8uu/2YD/reaVsZV4oJ4g7UDYFqQGWvT1W9Tsj6q4VtWBSaig38Qgah0ZMnQGF9kAsAim08EXDO1nSi0+Nog== + dependencies: + "@types/parsimmon" "^1.3.0" + parsimmon "^1.2.0" + +definitelytyped-header-parser@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/definitelytyped-header-parser/-/definitelytyped-header-parser-3.7.2.tgz#a5b2ec9521762910e870477b01ce9feca06d9fb7" + integrity sha512-nlkiv+QLlRSc3C3qAbusWPaBiyPLldwRFnrxvoxjdZHvHbIh2+U09qdmzzWV35Rs/I3MMhcoWRcVUi3M1G935Q== + dependencies: + "@types/parsimmon" "^1.3.0" + parsimmon "^1.2.0" + del@^2.0.2: version "2.2.2" resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" @@ -3444,9 +3476,10 @@ di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" -diff@3.5.0, diff@^3.1.0: +diff@3.5.0, diff@^3.1.0, diff@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" + integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== diffie-hellman@^5.0.0: version "5.0.3" @@ -3510,6 +3543,34 @@ dotenv@^8.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.1.0.tgz#d811e178652bfb8a1e593c6dd704ec7e90d85ea2" integrity sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA== +download-file-sync@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/download-file-sync/-/download-file-sync-1.0.4.tgz#d3e3c543f836f41039455b9034c72e355b036019" + integrity sha1-0+PFQ/g29BA5RVuQNMcuNVsDYBk= + +dts-critic@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dts-critic/-/dts-critic-2.0.0.tgz#9d52943326d57df0691aa0479010a73ccb855a4f" + integrity sha512-oYo69B8NcjUoDhKh8oUl58ljMsgyWnPR0Qf3QKJmKjm5LvkQ21v4SW+QCOleI1Cs0HRN6zEYllvQEORGd45wOQ== + dependencies: + definitelytyped-header-parser "^1.2.0" + download-file-sync "^1.0.4" + semver "^6.2.0" + yargs "^12.0.5" + +dtslint@^0.9.6: + version "0.9.6" + resolved "https://registry.yarnpkg.com/dtslint/-/dtslint-0.9.6.tgz#ccc564f226de14b3021e457127dd07e447c85b60" + integrity sha512-BIPTSnpYyGJxVcToYnw9KPkw3Er7hhK21E/QIBYWbkKkAa065221f8MVHwePB13TkyLOFCNdQOPICNnrQ+rfoA== + dependencies: + definitelytyped-header-parser "^3.7.2" + dts-critic "^2.0.0" + fs-extra "^6.0.1" + request "^2.88.0" + strip-json-comments "^2.0.1" + tslint "5.14.0" + typescript next + duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -4376,6 +4437,15 @@ fs-access@^1.0.0: dependencies: null-check "^1.0.0" +fs-extra@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" + integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6" @@ -4962,6 +5032,7 @@ ignore@^4.0.2: ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== import-cwd@^3.0.0: version "3.0.0" @@ -5562,7 +5633,7 @@ js-string-escape@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" -js-tokens@^3.0.0: +js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" @@ -5581,7 +5652,7 @@ js-yaml@^3.12.0, js-yaml@^3.9.0: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -7269,6 +7340,11 @@ parseurl@~1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" +parsimmon@^1.2.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.13.0.tgz#6e4ef3dbd45ed6ea6808be600ac4b9c8a44228cf" + integrity sha512-5UIrOCW+gjbILkjKPgTgmq8LKf8TT3Iy7kN2VD7OtQ81facKn8B4gG1X94jWqXYZsxG2KbJhrv/Yq/5H6BQn7A== + pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" @@ -7925,9 +8001,10 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@^2.87.0: +request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" + integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -8114,7 +8191,7 @@ semver@^5.6.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== -semver@^6.0.0: +semver@^6.0.0, semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -8947,10 +9024,41 @@ ts-node@^7.0.1: source-map-support "^0.5.6" yn "^2.0.0" +tslib@^1.8.0, tslib@^1.8.1: + version "1.10.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" + integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + tslib@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" +tslint@5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e" + integrity sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ== + dependencies: + babel-code-frame "^6.22.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^3.2.0" + glob "^7.1.1" + js-yaml "^3.7.0" + minimatch "^3.0.4" + mkdirp "^0.5.1" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.8.0" + tsutils "^2.29.0" + +tsutils@^2.29.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" + integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== + dependencies: + tslib "^1.8.1" + tty-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" @@ -8993,6 +9101,11 @@ typescript@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8" +typescript@next: + version "3.7.0-dev.20190907" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20190907.tgz#6952fcfe58ba14ad2fa16749d90f7bb4138aa992" + integrity sha512-zUtlsa6sFacCu4sFMWu8/6CmjRthT+8+8sMUAGQxHWLWO9KDeGoL3MfMygUlffN9l7GnDwqNamu0M9pHgHXlFw== + typical@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" @@ -9149,6 +9262,7 @@ upath@^1.0.5: update-notifier@^2.3.0: version "2.5.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6" + integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw== dependencies: boxen "^1.2.1" chalk "^2.0.1" @@ -9526,6 +9640,14 @@ yargs-parser@^10.0.0, yargs-parser@^10.1.0: dependencies: camelcase "^4.1.0" +yargs-parser@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" + integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" @@ -9606,6 +9728,24 @@ yargs@^12.0.2: y18n "^3.2.1 || ^4.0.0" yargs-parser "^10.1.0" +yargs@^12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" + integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== + dependencies: + cliui "^4.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" + get-caller-file "^1.0.1" + os-locale "^3.0.0" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^2.0.0" + which-module "^2.0.0" + y18n "^3.2.1 || ^4.0.0" + yargs-parser "^11.1.1" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" From 5d3ac2dc69df0cbdcd494107c04e71b31cd2efc6 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Thu, 12 Sep 2019 05:09:10 +0000 Subject: [PATCH 008/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1235c0755..d48d49891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# v0.8.1 (Thu Sep 12 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/utils` + - Fix 0.8 typings, add type tests [#786](https://github.com/oliver-moran/jimp/pull/786) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +--- + # v0.8.0 (Sat Sep 07 2019) #### 🚀 Enhancement From 4242e41056cdbab8080c45c22e47716864a29503 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Thu, 12 Sep 2019 05:09:12 +0000 Subject: [PATCH 009/223] Bump version to: 0.8.1 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index 699852c75..bd91a8c06 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.8.0" + "version": "0.8.1" } diff --git a/packages/cli/package.json b/packages/cli/package.json index c66c2a46c..5b2399967 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.8.0", + "version": "0.8.1", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.0", + "@jimp/custom": "^0.8.1", "chalk": "^2.4.1", - "jimp": "^0.8.0", + "jimp": "^0.8.1", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 95fdc7e72..50a795b25 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.8.0", + "version": "0.8.1", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index c359e3928..a925be257 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.8.0", + "version": "0.8.1", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.8.0", + "@jimp/core": "^0.8.1", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 24b4f4a42..b782faaee 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.8.0", + "version": "0.8.1", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -58,14 +58,14 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/plugins": "^0.8.0", - "@jimp/types": "^0.8.0", + "@jimp/custom": "^0.8.1", + "@jimp/plugins": "^0.8.1", + "@jimp/types": "^0.8.1", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@jimp/test-utils": "^0.8.0", + "@jimp/test-utils": "^0.8.1", "babelify": "^10.0.0", "browserify": "^16.2.2", "envify": "^4.1.0", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 776ade705..2e6986788 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.8.0", + "version": "0.8.1", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/jpeg": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/jpeg": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index e75a41ba2..8df1fd6d5 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.8.0", + "version": "0.8.1", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 19b952641..b6f776926 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.8.0", + "version": "0.8.1", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 5f64b467d..ae0c7fe51 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.8.0", + "version": "0.8.1", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0", - "@jimp/types": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1", + "@jimp/types": "^0.8.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 2b156d992..7f0925e18 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.8.0", + "version": "0.8.1", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/plugin-blit": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0", - "@jimp/plugin-scale": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/plugin-blit": "^0.8.1", + "@jimp/plugin-resize": "^0.8.1", + "@jimp/plugin-scale": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 548ffe9b1..d794d2f09 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.8.0", + "version": "0.8.1", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/plugin-crop": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0", - "@jimp/plugin-scale": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/plugin-crop": "^0.8.1", + "@jimp/plugin-resize": "^0.8.1", + "@jimp/plugin-scale": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 3023127a8..6af737b1b 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.8.0", + "version": "0.8.1", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index b731c2dd1..8a32eaea8 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.8.0", + "version": "0.8.1", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index eb1aa2218..95cf03096 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.8.0", + "version": "0.8.1", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 1460b1289..08dc72c7e 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.8.0", + "version": "0.8.1", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index a69e402e7..8e5e05689 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.8.0", + "version": "0.8.1", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index d65321b09..7eaa59d7c 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.8.0", + "version": "0.8.1", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index d3a80ad8a..80f822388 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.8.0", + "version": "0.8.1", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 3b616dc15..533e299fd 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.8.0", + "version": "0.8.1", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 61dbcc158..6eb9d0f15 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.8.0", + "version": "0.8.1", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index d6e1c035a..408d7a023 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.8.0", + "version": "0.8.1", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/plugin-blit": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/plugin-blit": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 36fea6ffa..35b0707f4 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.8.0", + "version": "0.8.1", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 647fe277d..5010d203f 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.8.0", + "version": "0.8.1", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/plugin-blit": "^0.8.0", - "@jimp/plugin-crop": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/plugin-blit": "^0.8.1", + "@jimp/plugin-crop": "^0.8.1", + "@jimp/plugin-resize": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 196e81de2..c93386ed8 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.8.0", + "version": "0.8.1", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 360ddc960..feaaf7ae5 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.8.0", + "version": "0.8.1", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/plugin-blur": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/plugin-blur": "^0.8.1", + "@jimp/plugin-resize": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 979b07707..8982b1d38 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.8.0", + "version": "0.8.1", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/jpeg": "^0.8.0", - "@jimp/plugin-color": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/jpeg": "^0.8.1", + "@jimp/plugin-color": "^0.8.1", + "@jimp/plugin-resize": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index eaeddaec2..aa662a191 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.8.0", - "@jimp/plugin-blur": "^0.8.0", - "@jimp/plugin-color": "^0.8.0", - "@jimp/plugin-contain": "^0.8.0", - "@jimp/plugin-cover": "^0.8.0", - "@jimp/plugin-crop": "^0.8.0", - "@jimp/plugin-displace": "^0.8.0", - "@jimp/plugin-dither": "^0.8.0", - "@jimp/plugin-flip": "^0.8.0", - "@jimp/plugin-gaussian": "^0.8.0", - "@jimp/plugin-invert": "^0.8.0", - "@jimp/plugin-mask": "^0.8.0", - "@jimp/plugin-normalize": "^0.8.0", - "@jimp/plugin-print": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0", - "@jimp/plugin-rotate": "^0.8.0", - "@jimp/plugin-scale": "^0.8.0", + "@jimp/plugin-blit": "^0.8.1", + "@jimp/plugin-blur": "^0.8.1", + "@jimp/plugin-color": "^0.8.1", + "@jimp/plugin-contain": "^0.8.1", + "@jimp/plugin-cover": "^0.8.1", + "@jimp/plugin-crop": "^0.8.1", + "@jimp/plugin-displace": "^0.8.1", + "@jimp/plugin-dither": "^0.8.1", + "@jimp/plugin-flip": "^0.8.1", + "@jimp/plugin-gaussian": "^0.8.1", + "@jimp/plugin-invert": "^0.8.1", + "@jimp/plugin-mask": "^0.8.1", + "@jimp/plugin-normalize": "^0.8.1", + "@jimp/plugin-print": "^0.8.1", + "@jimp/plugin-resize": "^0.8.1", + "@jimp/plugin-rotate": "^0.8.1", + "@jimp/plugin-scale": "^0.8.1", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 2941f7618..7aa1e4282 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.8.0", + "version": "0.8.1", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.8.0", + "@jimp/custom": "^0.8.1", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 29d516359..0bfcd6a28 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index e73b7a49a..25769ef06 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 0bff2b434..026e7a475 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index f84b889cc..170002827 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.0", + "@jimp/utils": "^0.8.1", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 841d9098c..c894d8900 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.0", - "@jimp/test-utils": "^0.8.0" + "@jimp/custom": "^0.8.1", + "@jimp/test-utils": "^0.8.1" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index 16711b271..056ccc686 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.8.0", + "version": "0.8.1", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.8.0", - "@jimp/gif": "^0.8.0", - "@jimp/jpeg": "^0.8.0", - "@jimp/png": "^0.8.0", - "@jimp/tiff": "^0.8.0", + "@jimp/bmp": "^0.8.1", + "@jimp/gif": "^0.8.1", + "@jimp/jpeg": "^0.8.1", + "@jimp/png": "^0.8.1", + "@jimp/tiff": "^0.8.1", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index a3385c9d0..ca59664ca 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.8.0", + "version": "0.8.1", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 25a2ed7518f464773a2be62e0a8763b032daff94 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 13 Sep 2019 10:27:07 -0700 Subject: [PATCH 010/223] must ship types (#794) --- packages/jimp/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/jimp/package.json b/packages/jimp/package.json index b782faaee..6e91377cb 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -19,7 +19,8 @@ "dist", "es", "index.d.ts", - "fonts" + "fonts", + "types" ], "repository": { "type": "git", From 76294fb41cf13055febe9850bfecddbd92d0cc33 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 13 Sep 2019 17:33:32 +0000 Subject: [PATCH 011/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d48d49891..319ef4f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.8.2 (Fri Sep 13 2019) + +#### 🐛 Bug Fix + +- `jimp` + - must ship types [#794](https://github.com/oliver-moran/jimp/pull/794) ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 1 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +--- + # v0.8.1 (Thu Sep 12 2019) #### 🐛 Bug Fix From c4575b6fb9f25c8bad05f05541bf195da21791e6 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 13 Sep 2019 17:33:34 +0000 Subject: [PATCH 012/223] Bump version to: 0.8.2 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index bd91a8c06..76f876363 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.8.1" + "version": "0.8.2" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 5b2399967..471109e55 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.8.1", + "version": "0.8.2", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.1", + "@jimp/custom": "^0.8.2", "chalk": "^2.4.1", - "jimp": "^0.8.1", + "jimp": "^0.8.2", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 50a795b25..a54a4c181 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.8.1", + "version": "0.8.2", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index a925be257..3f64d2a72 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.8.1", + "version": "0.8.2", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.8.1", + "@jimp/core": "^0.8.2", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 6e91377cb..f803010d1 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.8.1", + "version": "0.8.2", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -59,14 +59,14 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/plugins": "^0.8.1", - "@jimp/types": "^0.8.1", + "@jimp/custom": "^0.8.2", + "@jimp/plugins": "^0.8.2", + "@jimp/types": "^0.8.2", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@jimp/test-utils": "^0.8.1", + "@jimp/test-utils": "^0.8.2", "babelify": "^10.0.0", "browserify": "^16.2.2", "envify": "^4.1.0", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 2e6986788..3d9631a66 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.8.1", + "version": "0.8.2", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/jpeg": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/jpeg": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 8df1fd6d5..88a1e2f16 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.8.1", + "version": "0.8.2", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index b6f776926..66549a68a 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.8.1", + "version": "0.8.2", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index ae0c7fe51..8e09ef2e7 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.8.1", + "version": "0.8.2", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1", - "@jimp/types": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2", + "@jimp/types": "^0.8.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 7f0925e18..04bda793b 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.8.1", + "version": "0.8.2", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/plugin-blit": "^0.8.1", - "@jimp/plugin-resize": "^0.8.1", - "@jimp/plugin-scale": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/plugin-blit": "^0.8.2", + "@jimp/plugin-resize": "^0.8.2", + "@jimp/plugin-scale": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index d794d2f09..680effb91 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.8.1", + "version": "0.8.2", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/plugin-crop": "^0.8.1", - "@jimp/plugin-resize": "^0.8.1", - "@jimp/plugin-scale": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/plugin-crop": "^0.8.2", + "@jimp/plugin-resize": "^0.8.2", + "@jimp/plugin-scale": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 6af737b1b..4c98088b9 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.8.1", + "version": "0.8.2", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 8a32eaea8..a33ca54c9 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.8.1", + "version": "0.8.2", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 95cf03096..8f75646ba 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.8.1", + "version": "0.8.2", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 08dc72c7e..71c07afa1 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.8.1", + "version": "0.8.2", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 8e5e05689..84d1dea79 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.8.1", + "version": "0.8.2", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 7eaa59d7c..f2abcee67 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.8.1", + "version": "0.8.2", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 80f822388..3ca1c87db 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.8.1", + "version": "0.8.2", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 533e299fd..bcdfe2fc0 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.8.1", + "version": "0.8.2", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 6eb9d0f15..9ab1f35f2 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.8.1", + "version": "0.8.2", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 408d7a023..a73414f14 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.8.1", + "version": "0.8.2", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/plugin-blit": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/plugin-blit": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 35b0707f4..fcff73ae4 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.8.1", + "version": "0.8.2", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 5010d203f..28ab6fd02 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.8.1", + "version": "0.8.2", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/plugin-blit": "^0.8.1", - "@jimp/plugin-crop": "^0.8.1", - "@jimp/plugin-resize": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/plugin-blit": "^0.8.2", + "@jimp/plugin-crop": "^0.8.2", + "@jimp/plugin-resize": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index c93386ed8..d2af5b7b6 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.8.1", + "version": "0.8.2", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index feaaf7ae5..a33eea53f 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.8.1", + "version": "0.8.2", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/plugin-blur": "^0.8.1", - "@jimp/plugin-resize": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/plugin-blur": "^0.8.2", + "@jimp/plugin-resize": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 8982b1d38..1a1ffe445 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.8.1", + "version": "0.8.2", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/jpeg": "^0.8.1", - "@jimp/plugin-color": "^0.8.1", - "@jimp/plugin-resize": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/jpeg": "^0.8.2", + "@jimp/plugin-color": "^0.8.2", + "@jimp/plugin-resize": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index aa662a191..2847c4385 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.8.1", - "@jimp/plugin-blur": "^0.8.1", - "@jimp/plugin-color": "^0.8.1", - "@jimp/plugin-contain": "^0.8.1", - "@jimp/plugin-cover": "^0.8.1", - "@jimp/plugin-crop": "^0.8.1", - "@jimp/plugin-displace": "^0.8.1", - "@jimp/plugin-dither": "^0.8.1", - "@jimp/plugin-flip": "^0.8.1", - "@jimp/plugin-gaussian": "^0.8.1", - "@jimp/plugin-invert": "^0.8.1", - "@jimp/plugin-mask": "^0.8.1", - "@jimp/plugin-normalize": "^0.8.1", - "@jimp/plugin-print": "^0.8.1", - "@jimp/plugin-resize": "^0.8.1", - "@jimp/plugin-rotate": "^0.8.1", - "@jimp/plugin-scale": "^0.8.1", + "@jimp/plugin-blit": "^0.8.2", + "@jimp/plugin-blur": "^0.8.2", + "@jimp/plugin-color": "^0.8.2", + "@jimp/plugin-contain": "^0.8.2", + "@jimp/plugin-cover": "^0.8.2", + "@jimp/plugin-crop": "^0.8.2", + "@jimp/plugin-displace": "^0.8.2", + "@jimp/plugin-dither": "^0.8.2", + "@jimp/plugin-flip": "^0.8.2", + "@jimp/plugin-gaussian": "^0.8.2", + "@jimp/plugin-invert": "^0.8.2", + "@jimp/plugin-mask": "^0.8.2", + "@jimp/plugin-normalize": "^0.8.2", + "@jimp/plugin-print": "^0.8.2", + "@jimp/plugin-resize": "^0.8.2", + "@jimp/plugin-rotate": "^0.8.2", + "@jimp/plugin-scale": "^0.8.2", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 7aa1e4282..f88e78b47 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.8.1", + "version": "0.8.2", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.8.1", + "@jimp/custom": "^0.8.2", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 0bfcd6a28..845a475c8 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 25769ef06..d05216a99 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 026e7a475..df42c926b 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 170002827..4dd0c9da7 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.1", + "@jimp/utils": "^0.8.2", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index c894d8900..cc045b830 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.1", - "@jimp/test-utils": "^0.8.1" + "@jimp/custom": "^0.8.2", + "@jimp/test-utils": "^0.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index 056ccc686..694966ed0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.8.1", + "version": "0.8.2", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.8.1", - "@jimp/gif": "^0.8.1", - "@jimp/jpeg": "^0.8.1", - "@jimp/png": "^0.8.1", - "@jimp/tiff": "^0.8.1", + "@jimp/bmp": "^0.8.2", + "@jimp/gif": "^0.8.2", + "@jimp/jpeg": "^0.8.2", + "@jimp/png": "^0.8.2", + "@jimp/tiff": "^0.8.2", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index ca59664ca..bc121c7bc 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.8.1", + "version": "0.8.2", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From e4bb7624f651f4800e572ba920ddfe33339dbc02 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Wed, 18 Sep 2019 16:19:21 -0700 Subject: [PATCH 013/223] =?UTF-8?q?Fix=20issues=20with=20typings=20using?= =?UTF-8?q?=20classes,=20publish=20@core=20typings,=C2=A0and=20fix=203.1?= =?UTF-8?q?=20typings=20(#792)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Includes `types` folder for jimp and @jimp/core for builds * Revert main `jimp` package to use more similar typing to 0.7, remove TS3.1 from packagejson * Fix issues with classes used within Jimp * Simplify custom types * Added tests for and fixed class usage in custom * Simplified custom and core typings by moving constructors to new interface * Added back 3.1 typings, fixed them, changed back to ES6 export * Remove unusable usages from prior TS docs * Added note about import differences * Add tests against Jimp instance cloning, fix types This requires us to remove 3.1 typings, left a note in the 3.1 tests on how to enable them again when things are working properly. --- packages/core/package.json | 3 +- packages/core/types/index.d.ts | 4 +- packages/core/types/jimp.d.ts | 30 ++--- packages/custom/types/index.d.ts | 45 +++---- packages/custom/types/test.ts | 176 +++++++++++++++++++++++---- packages/jimp/README.md | 20 +-- packages/jimp/package.json | 7 -- packages/jimp/types/index.d.ts | 57 ++++----- packages/jimp/types/test.ts | 23 ++++ packages/jimp/types/ts3.1/index.d.ts | 14 ++- packages/jimp/types/ts3.1/test.ts | 36 ++++++ 11 files changed, 285 insertions(+), 130 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index a54a4c181..28dc30a82 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -9,7 +9,8 @@ "dist", "es", "index.d.ts", - "fonts" + "fonts", + "types" ], "repository": { "type": "git", diff --git a/packages/core/types/index.d.ts b/packages/core/types/index.d.ts index c53d3c251..be6255223 100644 --- a/packages/core/types/index.d.ts +++ b/packages/core/types/index.d.ts @@ -2,8 +2,8 @@ export * from './etc'; export * from './functions'; export * from './plugins'; export * from './utils'; -import {Jimp} from './jimp'; +import {Jimp, JimpConstructors} from './jimp'; -export { Jimp }; +export { Jimp, JimpConstructors }; declare const defaultExp: Jimp; export default defaultExp; diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts index 715977f22..49b448742 100644 --- a/packages/core/types/jimp.d.ts +++ b/packages/core/types/jimp.d.ts @@ -10,22 +10,24 @@ import { RGB } from './etc'; -export declare class Jimp { - // Constructors - constructor(path: string, cb?: ImageCallback); - constructor(urlOptions: URLOptions, cb?: ImageCallback); - constructor(image: Jimp, cb?: ImageCallback); - constructor(data: Buffer, cb?: ImageCallback); - constructor(data: Bitmap, cb?: ImageCallback); - constructor(w: number, h: number, cb?: ImageCallback); - constructor( +export interface JimpConstructors { + new(path: string, cb?: ImageCallback): this; + new(urlOptions: URLOptions, cb?: ImageCallback): this; + new(image: Jimp, cb?: ImageCallback): this; + new(data: Buffer, cb?: ImageCallback): this; + new(data: Bitmap, cb?: ImageCallback): this; + new(w: number, h: number, cb?: ImageCallback): this; + new( w: number, h: number, background?: number | string, cb?: ImageCallback - ); + ): this; // For custom constructors when using Jimp.appendConstructorOption - constructor(...args: any[]); + new(...args: any[]): this; +} + +export interface Jimp extends JimpConstructors { prototype: this; // Constants AUTO: -1; @@ -75,7 +77,7 @@ export declare class Jimp { getExtension(): string; distanceFromHash(hash: string): number; write(path: string, cb?: ImageCallback): this; - writeAsync(path: string): Promise; + writeAsync(path: string): Promise; rgba(bool: boolean, cb?: ImageCallback): this; getBase64(mime: string, cb: GenericCallback): this; getBase64Async(mime: string): Promise; @@ -150,8 +152,8 @@ export declare class Jimp { name: string, test: (...args: T[]) => boolean, run: ( - this: Jimp, - resolve: (jimp: Jimp) => any, + this: this, + resolve: (jimp: this) => any, reject: (reason: Error) => any, ...args: T[] ) => any diff --git a/packages/custom/types/index.d.ts b/packages/custom/types/index.d.ts index 5ae06a01b..196f27f5e 100644 --- a/packages/custom/types/index.d.ts +++ b/packages/custom/types/index.d.ts @@ -5,44 +5,29 @@ import { Jimp, JimpPlugin, JimpType, - GetIntersectionFromPlugins + GetIntersectionFromPlugins, + JimpConstructors } from '@jimp/core'; -declare function configure< - PluginFuncArr extends FunctionRet, - JimpInstance extends Jimp = Jimp ->( - configuration: { - plugins: PluginFuncArr; - }, - jimpInstance?: JimpInstance -): Exclude & - GetIntersectionFromPlugins; - -declare function configure< - TypesFuncArr extends FunctionRet, - JimpInstance extends Jimp = Jimp ->( - configuration: { - types: TypesFuncArr; - }, - jimpInstance?: JimpInstance -): Exclude & - GetIntersectionFromPlugins; +type JimpInstance< + TypesFuncArr extends FunctionRet | undefined, + PluginFuncArr extends FunctionRet | undefined, + J extends Jimp +> = Exclude & + GetIntersectionFromPlugins> & + JimpConstructors; declare function configure< - TypesFuncArr extends FunctionRet, - PluginFuncArr extends FunctionRet, - JimpInstance extends Jimp = Jimp + TypesFuncArr extends FunctionRet | undefined = undefined, + PluginFuncArr extends FunctionRet | undefined = undefined, + J extends Jimp = Jimp >( configuration: { types?: TypesFuncArr; plugins?: PluginFuncArr; }, - jimpInstance?: JimpInstance + jimpInstance?: J // Since JimpInstance is required, we want to use the default `Jimp` type -): Exclude & - GetIntersectionFromPlugins & - GetIntersectionFromPlugins; +): JimpInstance; - export default configure; +export default configure; diff --git a/packages/custom/types/test.ts b/packages/custom/types/test.ts index 3cf91dfe8..489512ead 100644 --- a/packages/custom/types/test.ts +++ b/packages/custom/types/test.ts @@ -13,29 +13,56 @@ const CustomJimp = configure({ plugins: [displace, resize] }); -// Methods from types should be applied -CustomJimp.deflateLevel(4); -// Constants from types should be applied -// $ExpectType 0 -CustomJimp.PNG_FILTER_NONE; +test('can handle custom jimp', () => { + // Methods from types should be applied + CustomJimp.deflateLevel(4); + // Constants from types should be applied + // $ExpectType 0 + CustomJimp.PNG_FILTER_NONE; + + // Core functions should still work from Jimp + CustomJimp.read('Test'); + + // Constants should be applied from ill-formed plugins + CustomJimp.displace(CustomJimp, 2); + + // Methods should be applied from well-formed plugins + CustomJimp.resize(40, 40) + + // Constants should be applied from well-formed plugins + CustomJimp.RESIZE_NEAREST_NEIGHBOR + + // $ExpectError + CustomJimp.test; + + // $ExpectError + CustomJimp.func(); -// Core functions should still work from Jimp -CustomJimp.read('Test'); + const Jiimp = new CustomJimp('test'); + // Methods from types should be applied + Jiimp.deflateLevel(4); + // Constants from types should be applied + // $ExpectType 0 + Jiimp.PNG_FILTER_NONE; -// Constants should be applied from ill-formed plugins -CustomJimp.displace(CustomJimp, 2); + // Core functions should still work from Jimp + Jiimp.read('Test'); -// Methods should be applied from well-formed plugins -CustomJimp.resize(40, 40) + // Constants should be applied from ill-formed plugins + Jiimp.displace(Jiimp, 2); -// Constants should be applied from well-formed plugins -CustomJimp.RESIZE_NEAREST_NEIGHBOR + // Methods should be applied from well-formed plugins + Jiimp.resize(40, 40) + + // Constants should be applied from well-formed plugins + Jiimp.RESIZE_NEAREST_NEIGHBOR -// $ExpectError -CustomJimp.test; + // $ExpectError + Jiimp.test; -// $ExpectError -CustomJimp.func(); + // $ExpectError + Jiimp.func(); +}); test('can compose', () => { const OtherCustomJimp = configure({ @@ -68,6 +95,31 @@ test('can compose', () => { // $ExpectError OtherCustomJimp.func(); + + const Jiimp = new OtherCustomJimp('test'); + // Methods from types should be applied + Jiimp.deflateLevel(4); + // Constants from types should be applied + // $ExpectType 0 + Jiimp.PNG_FILTER_NONE; + + // Core functions should still work from Jimp + Jiimp.read('Test'); + + // Constants should be applied from ill-formed plugins + Jiimp.displace(Jiimp, 2); + + // Methods should be applied from well-formed plugins + Jiimp.resize(40, 40) + + // Constants should be applied from well-formed plugins + Jiimp.RESIZE_NEAREST_NEIGHBOR + + // $ExpectError + Jiimp.test; + + // $ExpectError + Jiimp.func(); }); test('can handle only plugins', () => { @@ -93,6 +145,26 @@ test('can handle only plugins', () => { // $ExpectError PluginsJimp.func(); + + const Jiimp = new PluginsJimp('test'); + + // Core functions should still work from Jimp + Jiimp.read('Test'); + + // Constants should be applied from ill-formed plugins + Jiimp.displace(Jiimp, 2); + + // Methods should be applied from well-formed plugins + Jiimp.resize(40, 40) + + // Constants should be applied from well-formed plugins + Jiimp.RESIZE_NEAREST_NEIGHBOR + + // $ExpectError + Jiimp.test; + + // $ExpectError + Jiimp.func(); }) test('can handle only all types', () => { @@ -103,7 +175,6 @@ test('can handle only all types', () => { // Methods from types should be applied TypesJimp.filterType(4); // Constants from types should be applied - // Commented for complexity errors // $ExpectType 0 TypesJimp.PNG_FILTER_NONE; @@ -112,6 +183,19 @@ test('can handle only all types', () => { // $ExpectError TypesJimp.func(); + + const Jiimp = new TypesJimp('test'); + // Methods from types should be applied + Jiimp.filterType(4); + // Constants from types should be applied + // $ExpectType 0 + Jiimp.PNG_FILTER_NONE; + + // $ExpectError + Jiimp.test; + + // $ExpectError + Jiimp.func(); }); test('can handle only one type', () => { @@ -119,8 +203,11 @@ test('can handle only one type', () => { types: [png] }); + // Constants from other types should be not applied + // $ExpectError + PngJimp.MIME_TIFF; + // Constants from types should be applied - // Commented for complexity errors // $ExpectType 0 PngJimp.PNG_FILTER_NONE; @@ -129,24 +216,61 @@ test('can handle only one type', () => { // $ExpectError PngJimp.func(); + + + const Jiimp = new PngJimp('test'); + // Constants from other types should be not applied + // $ExpectError + Jiimp.MIME_TIFF; + + // Constants from types should be applied + // $ExpectType 0 + Jiimp.PNG_FILTER_NONE; + + // $ExpectError + Jiimp.test; + + // $ExpectError + Jiimp.func(); }); test('can handle only one plugin', () => { - const PngJimp = configure({ + const ResizeJimp = configure({ plugins: [resize] }); - // Constants from types should be applied - // Commented for complexity errors + // Constants from other plugins should be not applied + // $ExpectError + ResizeJimp.FONT_SANS_8_BLACK; + + // Constants from plugin should be applied // $ExpectType "nearestNeighbor" - PngJimp.RESIZE_NEAREST_NEIGHBOR; + ResizeJimp.RESIZE_NEAREST_NEIGHBOR; - PngJimp.resize(2, 2); + ResizeJimp.resize(2, 2); // $ExpectError - PngJimp.test; + ResizeJimp.test; // $ExpectError - PngJimp.func(); + ResizeJimp.func(); + + + const Jiimp: typeof ResizeJimp = new ResizeJimp('test'); + // Constants from other plugins should be not applied + // $ExpectError + Jiimp.FONT_SANS_8_BLACK; + + // Constants from plugin should be applied + // $ExpectType "nearestNeighbor" + Jiimp.RESIZE_NEAREST_NEIGHBOR; + + Jiimp.resize(2, 2); + + // $ExpectError + Jiimp.test; + + // $ExpectError + Jiimp.func(); }); diff --git a/packages/jimp/README.md b/packages/jimp/README.md index 509f104ed..3ff32cb6a 100644 --- a/packages/jimp/README.md +++ b/packages/jimp/README.md @@ -57,29 +57,13 @@ Jimp.read('lenna.png') ## TypeScript Usage -If you're using this library with TypeScript the method of importing slightly differs from JavaScript. You can import the library with three methods - -First of all using [`import = require()`](https://www.typescriptlang.org/docs/handbook/modules.html#export--and-import--require) method to import it as a `commonJS` module: - -```ts -import Jimp = require('jimp'); -``` - -Alternatively you can import it with ES6 default import scheme, if you set the `esModuleInterop` compiler flag to `true` in your `tsconfig` +If you're using this library with TypeScript the method of importing slightly differs from JavaScript. Instead of using require, you must import it with ES6 default import scheme ```ts import Jimp from 'jimp'; ``` -Lastly you can import it with a synthetic default import. This requires setting the `allowSyntheticDefaultImports` compiler option to `true` in your `tsconfig` - -```ts -import * as Jimp from 'jimp'; -``` - -**Note 1**: `esModuleInterop` implicitly sets `allowSyntheticDefaultImports` to `true` - -**Note 2**: `allowSyntheticDefaultImports` nor `esModuleInterop` change the runtime behavior of your code at all. They are just flags that tells TypeScript you need the compatibility they offer. +**Note**: This change in import does not change the runtime behavior of your code at all. ## Module Build diff --git a/packages/jimp/package.json b/packages/jimp/package.json index f803010d1..b16e3d40b 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -6,13 +6,6 @@ "module": "es/index.js", "browser": "browser/lib/jimp.js", "types": "types/index.d.ts", - "typesVersions": { - ">=3.1.0-0": { - "*": [ - "types/ts3.1/index.d.ts" - ] - } - }, "tonicExampleFilename": "example.js", "files": [ "browser", diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts index 74f0dc9da..6976b3a6d 100644 --- a/packages/jimp/types/index.d.ts +++ b/packages/jimp/types/index.d.ts @@ -1,23 +1,28 @@ // TypeScript Version: 2.8 + +declare const Jimp: Jimp; + +export default Jimp; + /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -declare class Jimp { +interface Jimp { // Constructors - constructor(path: string, cb?: ImageCallback); - constructor(urlOptions: URLOptions, cb?: ImageCallback); - constructor(image: Jimp, cb?: ImageCallback); - constructor(data: Buffer | Bitmap, cb?: ImageCallback); - constructor(w: number, h: number, cb?: ImageCallback); - constructor( + new(path: string, cb?: ImageCallback): Jimp; + new(urlOptions: URLOptions, cb?: ImageCallback): Jimp; + new(image: Jimp, cb?: ImageCallback): Jimp; + new(data: Buffer | Bitmap, cb?: ImageCallback): Jimp; + new(w: number, h: number, cb?: ImageCallback): Jimp; + new( w: number, h: number, background?: number | string, cb?: ImageCallback - ); + ): Jimp; // For custom constructors when using Jimp.appendConstructorOption - constructor(...args: any[]); + new(...args: any[]): Jimp; prototype: Jimp; // Constants @@ -411,10 +416,6 @@ declare class Jimp { ): this; } -declare const JimpInst: Jimp; - -export default JimpInst; - type GenericCallback = ( this: TThis, err: Error | null, @@ -467,26 +468,26 @@ type ListenerData = T extends 'any' ? any : T extends ChangeName ? { - eventName: 'before-change' | 'changed'; - methodName: T; - [key: string]: any; - } + eventName: 'before-change' | 'changed'; + methodName: T; + [key: string]: any; + } : { - eventName: T; - methodName: T extends 'initialized' - ? 'constructor' - : T extends 'before-change' | 'changed' - ? ChangeName - : T extends 'before-clone' | 'cloned' ? 'clone' : any; - }; + eventName: T; + methodName: T extends 'initialized' + ? 'constructor' + : T extends 'before-change' | 'changed' + ? ChangeName + : T extends 'before-clone' | 'cloned' ? 'clone' : any; + }; type PrintableText = | any | { - text: string; - alignmentX: number; - alignmentY: number; - }; + text: string; + alignmentX: number; + alignmentY: number; +}; type URLOptions = { url: string; diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts index 67220b5c7..3c36bc14c 100644 --- a/packages/jimp/types/test.ts +++ b/packages/jimp/types/test.ts @@ -1,5 +1,20 @@ import Jimp from 'jimp'; +const jimpInst: Jimp = new Jimp('test'); + +// Main Jimp export should already have all of these already applied +jimpInst.read('Test'); +jimpInst.displace(jimpInst, 2); +jimpInst.resize(40, 40); +// $ExpectType 0 +jimpInst.PNG_FILTER_NONE; + +// $ExpectError +jimpInst.test; + +// $ExpectError +jimpInst.func(); + // Main Jimp export should already have all of these already applied Jimp.read('Test'); Jimp.displace(Jimp, 2); @@ -12,3 +27,11 @@ Jimp.test; // $ExpectError Jimp.func(); + +test('can clone properly', async () => { + const baseImage = await Jimp.read('filename'); + const finalImage = baseImage.clone() + .resize(1, 1) + .setPixelColor(0x00000000, 0, 0) + .resize(2, 2); +}); diff --git a/packages/jimp/types/ts3.1/index.d.ts b/packages/jimp/types/ts3.1/index.d.ts index 8125aeb7b..9e259f1f8 100644 --- a/packages/jimp/types/ts3.1/index.d.ts +++ b/packages/jimp/types/ts3.1/index.d.ts @@ -10,9 +10,9 @@ import { Bitmap, RGB, RGBA, - WellFormedValues, UnionToIntersection, - GetPluginVal + GetPluginVal, + JimpConstructors } from '@jimp/core'; import typeFn from '@jimp/types'; import pluginFn from '@jimp/plugins'; @@ -24,6 +24,12 @@ export { Bitmap, RGB, RGBA }; export { FontChar, FontInfo, FontCommon, Font } from '@jimp/plugin-print'; -export type FullJimpType = JimpType & UnionToIntersection> & UnionToIntersection>; -declare const Jimp: FullJimpType; +type IntersectedPluginTypes = UnionToIntersection< + GetPluginVal | GetPluginVal + >; + +type Jimp = InstanceType> & ThisType & IntersectedPluginTypes; + +declare const Jimp: JimpConstructors & ThisType & Jimp; + export default Jimp; diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts index 67220b5c7..1f2c16d77 100644 --- a/packages/jimp/types/ts3.1/test.ts +++ b/packages/jimp/types/ts3.1/test.ts @@ -1,5 +1,20 @@ import Jimp from 'jimp'; +const jimpInst: Jimp = new Jimp('test'); + +// Main Jimp export should already have all of these already applied +jimpInst.read('Test'); +jimpInst.displace(jimpInst, 2); +jimpInst.resize(40, 40); +// $ExpectType 0 +jimpInst.PNG_FILTER_NONE; + +// $ExpectError +jimpInst.test; + +// $ExpectError +jimpInst.func(); + // Main Jimp export should already have all of these already applied Jimp.read('Test'); Jimp.displace(Jimp, 2); @@ -12,3 +27,24 @@ Jimp.test; // $ExpectError Jimp.func(); + +/** + * FIXME: Enable the 3.1 typings again, this is the last part that needs + * fixing. + * + * 3.1 typing can be fixed by adding the following to the package.json: + "typesVersions": { + ">=3.1.0-0": { + "*": [ + "types/ts3.1/index.d.ts" + ] + } + }, + */ +test('can clone properly', async () => { + const baseImage = await Jimp.read('filename'); + const finalImage = baseImage.clone() + .resize(1, 1) + .setPixelColor(0x00000000, 0, 0) + .resize(2, 2); +}); From dc22fab2dc57232e06936d79e7b31e61130ca7c0 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Wed, 18 Sep 2019 23:25:49 +0000 Subject: [PATCH 014/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 319ef4f2a..cdc0fecb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.8.3 (Wed Sep 18 2019) + +#### 🐛 Bug Fix + +- `@jimp/core`, `@jimp/custom`, `jimp` + - Fix issues with typings using classes, publish @core typings, and fix 3.1 typings [#792](https://github.com/oliver-moran/jimp/pull/792) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.8.2 (Fri Sep 13 2019) #### 🐛 Bug Fix From 42e184cf4681b71bc1594c8822be3553d152b5e2 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Wed, 18 Sep 2019 23:25:50 +0000 Subject: [PATCH 015/223] Bump version to: 0.8.3 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index 76f876363..24f2e4306 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.8.2" + "version": "0.8.3" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 471109e55..6b5e6b7e3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.8.2", + "version": "0.8.3", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.2", + "@jimp/custom": "^0.8.3", "chalk": "^2.4.1", - "jimp": "^0.8.2", + "jimp": "^0.8.3", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 28dc30a82..f446e628a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.8.2", + "version": "0.8.3", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -34,7 +34,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index 3f64d2a72..0ef8f2a1f 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.8.2", + "version": "0.8.3", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.8.2", + "@jimp/core": "^0.8.3", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index b16e3d40b..07aeb4cfa 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.8.2", + "version": "0.8.3", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -52,14 +52,14 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/plugins": "^0.8.2", - "@jimp/types": "^0.8.2", + "@jimp/custom": "^0.8.3", + "@jimp/plugins": "^0.8.3", + "@jimp/types": "^0.8.3", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@jimp/test-utils": "^0.8.2", + "@jimp/test-utils": "^0.8.3", "babelify": "^10.0.0", "browserify": "^16.2.2", "envify": "^4.1.0", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 3d9631a66..9c8118126 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.8.2", + "version": "0.8.3", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/jpeg": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/jpeg": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 88a1e2f16..8b741b3ab 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.8.2", + "version": "0.8.3", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 66549a68a..8305ff611 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.8.2", + "version": "0.8.3", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 8e09ef2e7..c2e4e9df9 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.8.2", + "version": "0.8.3", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2", - "@jimp/types": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3", + "@jimp/types": "^0.8.3" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 04bda793b..2b35f18c9 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.8.2", + "version": "0.8.3", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/plugin-blit": "^0.8.2", - "@jimp/plugin-resize": "^0.8.2", - "@jimp/plugin-scale": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/plugin-blit": "^0.8.3", + "@jimp/plugin-resize": "^0.8.3", + "@jimp/plugin-scale": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 680effb91..115dfb1b8 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.8.2", + "version": "0.8.3", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/plugin-crop": "^0.8.2", - "@jimp/plugin-resize": "^0.8.2", - "@jimp/plugin-scale": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/plugin-crop": "^0.8.3", + "@jimp/plugin-resize": "^0.8.3", + "@jimp/plugin-scale": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 4c98088b9..d7a87942a 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.8.2", + "version": "0.8.3", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index a33ca54c9..57bf5ca80 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.8.2", + "version": "0.8.3", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 8f75646ba..c5501fc7e 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.8.2", + "version": "0.8.3", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 71c07afa1..ca422b74d 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.8.2", + "version": "0.8.3", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 84d1dea79..065e8324c 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.8.2", + "version": "0.8.3", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index f2abcee67..d2af568d7 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.8.2", + "version": "0.8.3", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 3ca1c87db..4bb408d99 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.8.2", + "version": "0.8.3", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index bcdfe2fc0..713a837d7 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.8.2", + "version": "0.8.3", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 9ab1f35f2..9f00b9e6a 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.8.2", + "version": "0.8.3", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index a73414f14..560e6fb6e 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.8.2", + "version": "0.8.3", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/plugin-blit": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/plugin-blit": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index fcff73ae4..4d8c0239f 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.8.2", + "version": "0.8.3", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 28ab6fd02..b9ac15fd6 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.8.2", + "version": "0.8.3", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/plugin-blit": "^0.8.2", - "@jimp/plugin-crop": "^0.8.2", - "@jimp/plugin-resize": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/plugin-blit": "^0.8.3", + "@jimp/plugin-crop": "^0.8.3", + "@jimp/plugin-resize": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index d2af5b7b6..a6d511fb5 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.8.2", + "version": "0.8.3", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index a33eea53f..349f27754 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.8.2", + "version": "0.8.3", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/plugin-blur": "^0.8.2", - "@jimp/plugin-resize": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/plugin-blur": "^0.8.3", + "@jimp/plugin-resize": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 1a1ffe445..71bfc305b 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.8.2", + "version": "0.8.3", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/jpeg": "^0.8.2", - "@jimp/plugin-color": "^0.8.2", - "@jimp/plugin-resize": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/jpeg": "^0.8.3", + "@jimp/plugin-color": "^0.8.3", + "@jimp/plugin-resize": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 2847c4385..0e030f87f 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.8.2", - "@jimp/plugin-blur": "^0.8.2", - "@jimp/plugin-color": "^0.8.2", - "@jimp/plugin-contain": "^0.8.2", - "@jimp/plugin-cover": "^0.8.2", - "@jimp/plugin-crop": "^0.8.2", - "@jimp/plugin-displace": "^0.8.2", - "@jimp/plugin-dither": "^0.8.2", - "@jimp/plugin-flip": "^0.8.2", - "@jimp/plugin-gaussian": "^0.8.2", - "@jimp/plugin-invert": "^0.8.2", - "@jimp/plugin-mask": "^0.8.2", - "@jimp/plugin-normalize": "^0.8.2", - "@jimp/plugin-print": "^0.8.2", - "@jimp/plugin-resize": "^0.8.2", - "@jimp/plugin-rotate": "^0.8.2", - "@jimp/plugin-scale": "^0.8.2", + "@jimp/plugin-blit": "^0.8.3", + "@jimp/plugin-blur": "^0.8.3", + "@jimp/plugin-color": "^0.8.3", + "@jimp/plugin-contain": "^0.8.3", + "@jimp/plugin-cover": "^0.8.3", + "@jimp/plugin-crop": "^0.8.3", + "@jimp/plugin-displace": "^0.8.3", + "@jimp/plugin-dither": "^0.8.3", + "@jimp/plugin-flip": "^0.8.3", + "@jimp/plugin-gaussian": "^0.8.3", + "@jimp/plugin-invert": "^0.8.3", + "@jimp/plugin-mask": "^0.8.3", + "@jimp/plugin-normalize": "^0.8.3", + "@jimp/plugin-print": "^0.8.3", + "@jimp/plugin-resize": "^0.8.3", + "@jimp/plugin-rotate": "^0.8.3", + "@jimp/plugin-scale": "^0.8.3", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index f88e78b47..2d66c6614 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.8.2", + "version": "0.8.3", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.8.2", + "@jimp/custom": "^0.8.3", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 845a475c8..8e8710894 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index d05216a99..6d4207c7e 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index df42c926b..8cca0ebdf 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 4dd0c9da7..be9fcf5ad 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.2", + "@jimp/utils": "^0.8.3", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index cc045b830..e5ddabc27 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.2", - "@jimp/test-utils": "^0.8.2" + "@jimp/custom": "^0.8.3", + "@jimp/test-utils": "^0.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index 694966ed0..cb5549bd4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.8.2", + "version": "0.8.3", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.8.2", - "@jimp/gif": "^0.8.2", - "@jimp/jpeg": "^0.8.2", - "@jimp/png": "^0.8.2", - "@jimp/tiff": "^0.8.2", + "@jimp/bmp": "^0.8.3", + "@jimp/gif": "^0.8.3", + "@jimp/jpeg": "^0.8.3", + "@jimp/png": "^0.8.3", + "@jimp/tiff": "^0.8.3", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index bc121c7bc..1873db554 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.8.2", + "version": "0.8.3", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 8fdc360f6a903ab5ef22762e61335bda555b0c7f Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Fri, 20 Sep 2019 09:17:03 -0700 Subject: [PATCH 016/223] TS 3.1 fixed (#798) * Initial work to fix `this` errors * Fix ImageCallback to use `this` instead of `@jimp/core` * Add complex tests for custom and `jimp` for prior commits * Update TS dep on CLI so custom typings worked properly * Handle `this` issue on the core Jimp type method returns --- packages/cli/package.json | 2 +- packages/core/types/etc.d.ts | 12 +++-- packages/core/types/jimp.d.ts | 57 ++++++++++++--------- packages/core/types/utils.d.ts | 1 - packages/custom/types/test.ts | 76 ++++++++++++++++++++++++++++ packages/jimp/package.json | 7 +++ packages/jimp/types/index.d.ts | 70 ++++++++++++------------- packages/jimp/types/test.ts | 41 +++++++++++++-- packages/jimp/types/ts3.1/index.d.ts | 6 +-- packages/jimp/types/ts3.1/test.ts | 54 +++++++++++++------- packages/plugin-blit/index.d.ts | 6 +-- packages/plugin-blur/index.d.ts | 2 +- packages/plugin-circle/index.d.ts | 4 +- packages/plugin-color/index.d.ts | 34 ++++++------- packages/plugin-contain/index.d.ts | 8 +-- packages/plugin-cover/index.d.ts | 6 +-- packages/plugin-crop/index.d.ts | 55 ++++++++++---------- packages/plugin-displace/index.d.ts | 4 +- packages/plugin-dither/index.d.ts | 4 +- packages/plugin-fisheye/index.d.ts | 4 +- packages/plugin-flip/index.d.ts | 4 +- packages/plugin-gaussian/index.d.ts | 2 +- packages/plugin-invert/index.d.ts | 2 +- packages/plugin-mask/index.d.ts | 4 +- packages/plugin-normalize/index.d.ts | 2 +- packages/plugin-print/index.d.ts | 60 +++++++++++----------- packages/plugin-resize/index.d.ts | 14 ++--- packages/plugin-rotate/index.d.ts | 4 +- packages/plugin-scale/index.d.ts | 8 +-- packages/plugin-shadow/index.d.ts | 4 +- packages/plugin-threshold/index.d.ts | 2 +- packages/type-jpeg/index.d.ts | 16 +++--- packages/type-png/index.d.ts | 27 +++++----- yarn.lock | 7 +-- 34 files changed, 384 insertions(+), 225 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 6b5e6b7e3..416f019f9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -31,7 +31,7 @@ "@types/mocha": "^5.2.5", "@types/yargs": "^11.1.1", "ts-node": "^7.0.1", - "typescript": "^3.0.3" + "typescript": "^3.1.3" }, "nyc": { "extension": [ diff --git a/packages/core/types/etc.d.ts b/packages/core/types/etc.d.ts index 18b20f6e2..40bbf9ff1 100644 --- a/packages/core/types/etc.d.ts +++ b/packages/core/types/etc.d.ts @@ -15,15 +15,19 @@ export type GenericCallback = ( value: T ) => U; -export type ImageCallback = ( - this: Jimp, +/** + * `jimp` must be defined otherwise `this` will not apply properly + * for custom configurations where plugins and types are needed + */ +export type ImageCallback = ( + this: jimp, err: Error | null, - value: Jimp, + value: jimp, coords: { x: number; y: number; } -) => U; +) => any; type BlendMode = { mode: string; diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts index 49b448742..36339d14d 100644 --- a/packages/core/types/jimp.d.ts +++ b/packages/core/types/jimp.d.ts @@ -10,18 +10,30 @@ import { RGB } from './etc'; +interface DiffReturn { + percent: number; + image: This; +} + +interface ScanIteratorReturn { + x: number; + y: number; + idx: number; + image: This; +} + export interface JimpConstructors { - new(path: string, cb?: ImageCallback): this; - new(urlOptions: URLOptions, cb?: ImageCallback): this; - new(image: Jimp, cb?: ImageCallback): this; - new(data: Buffer, cb?: ImageCallback): this; - new(data: Bitmap, cb?: ImageCallback): this; - new(w: number, h: number, cb?: ImageCallback): this; + new(path: string, cb?: ImageCallback): this; + new(urlOptions: URLOptions, cb?: ImageCallback): this; + new(image: Jimp, cb?: ImageCallback): this; + new(data: Buffer, cb?: ImageCallback): this; + new(data: Bitmap, cb?: ImageCallback): this; + new(w: number, h: number, cb?: ImageCallback): this; new( w: number, h: number, background?: number | string, - cb?: ImageCallback + cb?: ImageCallback ): this; // For custom constructors when using Jimp.appendConstructorOption new(...args: any[]): this; @@ -66,7 +78,7 @@ export interface Jimp extends JimpConstructors { parseBitmap( data: Buffer, path: string | null | undefined, - cb?: ImageCallback + cb?: ImageCallback ): void; hasAlpha(): boolean; getHeight(): number; @@ -76,9 +88,9 @@ export interface Jimp extends JimpConstructors { getMIME(): string; getExtension(): string; distanceFromHash(hash: string): number; - write(path: string, cb?: ImageCallback): this; + write(path: string, cb?: ImageCallback): this; writeAsync(path: string): Promise; - rgba(bool: boolean, cb?: ImageCallback): this; + rgba(bool: boolean, cb?: ImageCallback): this; getBase64(mime: string, cb: GenericCallback): this; getBase64Async(mime: string): Promise; hash(cb?: GenericCallback): string; @@ -109,19 +121,19 @@ export interface Jimp extends JimpConstructors { y: number, cb?: GenericCallback ): number; - setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; - setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; - clone(cb?: ImageCallback): this; - cloneQuiet(cb?: ImageCallback): this; - background(hex: number, cb?: ImageCallback): this; - backgroundQuiet(hex: number, cb?: ImageCallback): this; + setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; + setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; + clone(cb?: ImageCallback): this; + cloneQuiet(cb?: ImageCallback): this; + background(hex: number, cb?: ImageCallback): this; + backgroundQuiet(hex: number, cb?: ImageCallback): this; scan( x: number, y: number, w: number, h: number, f: (this: this, x: number, y: number, idx: number) => any, - cb?: ImageCallback + cb?: ImageCallback ): this; scanQuiet( x: number, @@ -129,14 +141,14 @@ export interface Jimp extends JimpConstructors { w: number, h: number, f: (this: this, x: number, y: number, idx: number) => any, - cb?: ImageCallback + cb?: ImageCallback ): this; scanIterator( x: number, y: number, w: number, h: number - ): IterableIterator<{ x: number; y: number; idx: number; image: Jimp }>; + ): IterableIterator>; // Effect methods composite( @@ -144,7 +156,7 @@ export interface Jimp extends JimpConstructors { x: number, y: number, options?: BlendMode, - cb?: ImageCallback + cb?: ImageCallback ): this; // Functions @@ -180,10 +192,7 @@ export interface Jimp extends JimpConstructors { img1: Jimp, img2: Jimp, threshold?: number - ): { - percent: number; - image: Jimp; - }; + ): DiffReturn; distance(img1: Jimp, img2: Jimp): number; compareHashes(hash1: string, hash2: string): number; colorDiff(rgba1: RGB, rgba2: RGB): number; diff --git a/packages/core/types/utils.d.ts b/packages/core/types/utils.d.ts index fa773bce1..7a733d79c 100644 --- a/packages/core/types/utils.d.ts +++ b/packages/core/types/utils.d.ts @@ -1,5 +1,4 @@ import { - WellFormedPlugin, JimpType, JimpPlugin, } from './plugins'; diff --git a/packages/custom/types/test.ts b/packages/custom/types/test.ts index 489512ead..82f83fe3f 100644 --- a/packages/custom/types/test.ts +++ b/packages/custom/types/test.ts @@ -13,6 +13,82 @@ const CustomJimp = configure({ plugins: [displace, resize] }); +test('should function the same as the `jimp` types', () => { + const FullCustomJimp = configure({ + types: [types], + plugins: [plugins] + }); + + const jimpInst = new FullCustomJimp('test'); + + // Main Jimp export should already have all of these already applied + jimpInst.read('Test'); + jimpInst.displace(jimpInst, 2); + jimpInst.resize(40, 40); + // $ExpectType 0 + jimpInst.PNG_FILTER_NONE; + + // $ExpectError + jimpInst.test; + + // $ExpectError + jimpInst.func(); + + // Main Jimp export should already have all of these already applied + FullCustomJimp.read('Test'); + FullCustomJimp.displace(FullCustomJimp, 2); + FullCustomJimp.resize(40, 40); + // $ExpectType 0 + FullCustomJimp.PNG_FILTER_NONE; + + // $ExpectError + FullCustomJimp.test; + + // $ExpectError + FullCustomJimp.func(); + + test('can clone properly', async () => { + const baseImage = await FullCustomJimp.read('filename'); + const cloneBaseImage = baseImage.clone(); + + // $ExpectType -1 + cloneBaseImage.PNG_FILTER_AUTO; + + test('can handle `this` returns on the core type properly', () => { + // $ExpectType -1 + cloneBaseImage.diff(jimpInst, jimpInst).image.PNG_FILTER_AUTO + }); + + test('can handle `this` returns properly', () => { + cloneBaseImage + .resize(1, 1) + .crop(0, 0, 0, 0) + .mask(cloneBaseImage, 2, 2) + .print('a' as any, 2, 2, 'a' as any) + .resize(1, 1) + .quality(1) + .deflateLevel(2) + .PNG_FILTER_AUTO; + }); + + test('can handle imageCallbacks `this` properly', () => { + cloneBaseImage.rgba(false, (_, jimpCBIn) => { + jimpCBIn.read('Test'); + jimpCBIn.displace(jimpInst, 2); + jimpCBIn.resize(40, 40); + // $ExpectType 0 + jimpCBIn.PNG_FILTER_NONE; + + // $ExpectError + jimpCBIn.test; + + // $ExpectError + jimpCBIn.func(); + }) + }) + }); +}); + test('can handle custom jimp', () => { // Methods from types should be applied CustomJimp.deflateLevel(4); diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 07aeb4cfa..a516ef301 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -6,6 +6,13 @@ "module": "es/index.js", "browser": "browser/lib/jimp.js", "types": "types/index.d.ts", + "typesVersions": { + ">=3.1.0-0": { + "*": [ + "types/ts3.1/index.d.ts" + ] + } + }, "tonicExampleFilename": "example.js", "files": [ "browser", diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts index 6976b3a6d..8fd0aea61 100644 --- a/packages/jimp/types/index.d.ts +++ b/packages/jimp/types/index.d.ts @@ -1,29 +1,29 @@ // TypeScript Version: 2.8 -declare const Jimp: Jimp; +declare const DepreciatedJimp: DepreciatedJimp; -export default Jimp; +export default DepreciatedJimp; /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -interface Jimp { +interface DepreciatedJimp { // Constructors - new(path: string, cb?: ImageCallback): Jimp; - new(urlOptions: URLOptions, cb?: ImageCallback): Jimp; - new(image: Jimp, cb?: ImageCallback): Jimp; - new(data: Buffer | Bitmap, cb?: ImageCallback): Jimp; - new(w: number, h: number, cb?: ImageCallback): Jimp; + new(path: string, cb?: ImageCallback): this; + new(urlOptions: URLOptions, cb?: ImageCallback): this; + new(image: DepreciatedJimp, cb?: ImageCallback): this; + new(data: Buffer | Bitmap, cb?: ImageCallback): this; + new(w: number, h: number, cb?: ImageCallback): this; new( w: number, h: number, background?: number | string, cb?: ImageCallback - ): Jimp; + ): this; // For custom constructors when using Jimp.appendConstructorOption - new(...args: any[]): Jimp; - prototype: Jimp; + new(...args: any[]): this; + prototype: this; // Constants AUTO: -1; @@ -123,7 +123,7 @@ interface Jimp { getExtension(): string; distanceFromHash(hash: string): number; write(path: string, cb?: ImageCallback): this; - writeAsync(path: string): Promise; + writeAsync(path: string): Promise; deflateLevel(l: number, cb?: ImageCallback): this; deflateStrategy(s: number, cb?: ImageCallback): this; colorType(s: number, cb?: ImageCallback): this; @@ -187,7 +187,7 @@ interface Jimp { y: number, w: number, h: number - ): IterableIterator<{ x: number; y: number; idx: number; image: Jimp }>; + ): IterableIterator<{ x: number; y: number; idx: number; image: DepreciatedJimp }>; crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): this; cropQuiet( x: number, @@ -264,7 +264,7 @@ interface Jimp { scale(f: number, mode?: string, cb?: ImageCallback): this; scaleToFit(w: number, h: number, cb?: ImageCallback): this; scaleToFit(w: number, h: number, mode?: string, cb?: ImageCallback): this; - displace(map: Jimp, offset: number, cb?: ImageCallback): this; + displace(map: DepreciatedJimp, offset: number, cb?: ImageCallback): this; autocrop(tolerance?: number, cb?: ImageCallback): this; autocrop(cropOnlyFrames?: boolean, cb?: ImageCallback): this; autocrop( @@ -321,15 +321,15 @@ interface Jimp { invert(cb?: ImageCallback): this; gaussian(r: number, cb?: ImageCallback): this; composite( - src: Jimp, + src: DepreciatedJimp, x: number, y: number, options?: BlendMode, cb?: ImageCallback ): this; - blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + blit(src: DepreciatedJimp, x: number, y: number, cb?: ImageCallback): this; blit( - src: Jimp, + src: DepreciatedJimp, x: number, y: number, srcx: number, @@ -338,46 +338,46 @@ interface Jimp { srch: number, cb?: ImageCallback ): this; - mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + mask(src: this, x: number, y: number, cb?: ImageCallback): this; // Functions appendConstructorOption( name: string, test: (...args: T[]) => boolean, run: ( - this: Jimp, - resolve: (jimp: Jimp) => any, + this: this, + resolve: (jimp: this) => any, reject: (reason: Error) => any, ...args: T[] ) => any ): void; - read(path: string): Promise; - read(image: Jimp): Promise; - read(data: Buffer): Promise; - read(w: number, h: number, background?: number | string): Promise; - create(path: string): Promise; - create(image: Jimp): Promise; - create(data: Buffer): Promise; - create(w: number, h: number, background?: number | string): Promise; + read(path: string): Promise; + read(image: this): Promise; + read(data: Buffer): Promise; + read(w: number, h: number, background?: number | string): Promise; + create(path: string): Promise; + create(image: this): Promise; + create(data: Buffer): Promise; + create(w: number, h: number, background?: number | string): Promise; rgbaToInt( r: number, g: number, b: number, a: number, - cb: GenericCallback + cb: GenericCallback ): number; intToRGBA(i: number, cb?: GenericCallback): RGBA; cssColorToHex(cssColor: string): number; limit255(n: number): number; diff( - img1: Jimp, - img2: Jimp, + img1: this, + img2: this, threshold?: number ): { percent: number; - image: Jimp; + image: DepreciatedJimp; }; - distance(img1: Jimp, img2: Jimp): number; + distance(img1: this, img2: this): number; compareHashes(hash1: string, hash2: string): number; colorDiff(rgba1: RGB, rgba2: RGB): number; colorDiff(rgba1: RGBA, rgba2: RGBA): number; @@ -423,9 +423,9 @@ type GenericCallback = ( ) => U; type ImageCallback = ( - this: Jimp, + this: DepreciatedJimp, err: Error | null, - value: Jimp, + value: DepreciatedJimp, coords: { x: number; y: number; diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts index 3c36bc14c..93d76dff9 100644 --- a/packages/jimp/types/test.ts +++ b/packages/jimp/types/test.ts @@ -30,8 +30,41 @@ Jimp.func(); test('can clone properly', async () => { const baseImage = await Jimp.read('filename'); - const finalImage = baseImage.clone() - .resize(1, 1) - .setPixelColor(0x00000000, 0, 0) - .resize(2, 2); + const cloneBaseImage = baseImage.clone(); + + // $ExpectType -1 + cloneBaseImage.PNG_FILTER_AUTO; + + test('can handle `this` returns on the core type properly', () => { + // $ExpectType -1 + cloneBaseImage.diff(jimpInst, jimpInst).image.PNG_FILTER_AUTO + }); + + test('can handle `this` returns properly', () => { + cloneBaseImage + .resize(1, 1) + .crop(0, 0, 0, 0) + .mask(cloneBaseImage, 2, 2) + .print('a' as any, 2, 2, 'a' as any) + .resize(1, 1) + .quality(1) + .deflateLevel(2) + .PNG_FILTER_AUTO; + }); + + test('can handle imageCallbacks `this` properly', () => { + cloneBaseImage.rgba(false, (_, jimpCBIn) => { + jimpCBIn.read('Test'); + jimpCBIn.displace(jimpInst, 2); + jimpCBIn.resize(40, 40); + // $ExpectType 0 + jimpCBIn.PNG_FILTER_NONE; + + // $ExpectError + jimpCBIn.test; + + // $ExpectError + jimpCBIn.func(); + }) + }) }); diff --git a/packages/jimp/types/ts3.1/index.d.ts b/packages/jimp/types/ts3.1/index.d.ts index 9e259f1f8..a619e00af 100644 --- a/packages/jimp/types/ts3.1/index.d.ts +++ b/packages/jimp/types/ts3.1/index.d.ts @@ -26,10 +26,10 @@ export { FontChar, FontInfo, FontCommon, Font } from '@jimp/plugin-print'; type IntersectedPluginTypes = UnionToIntersection< GetPluginVal | GetPluginVal - >; +>; -type Jimp = InstanceType> & ThisType & IntersectedPluginTypes; +type Jimp = InstanceType & IntersectedPluginTypes; -declare const Jimp: JimpConstructors & ThisType & Jimp; +declare const Jimp: JimpConstructors & Jimp; export default Jimp; diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts index 1f2c16d77..8a3a271b2 100644 --- a/packages/jimp/types/ts3.1/test.ts +++ b/packages/jimp/types/ts3.1/test.ts @@ -28,23 +28,43 @@ Jimp.test; // $ExpectError Jimp.func(); -/** - * FIXME: Enable the 3.1 typings again, this is the last part that needs - * fixing. - * - * 3.1 typing can be fixed by adding the following to the package.json: - "typesVersions": { - ">=3.1.0-0": { - "*": [ - "types/ts3.1/index.d.ts" - ] - } - }, - */ test('can clone properly', async () => { const baseImage = await Jimp.read('filename'); - const finalImage = baseImage.clone() - .resize(1, 1) - .setPixelColor(0x00000000, 0, 0) - .resize(2, 2); + const cloneBaseImage = baseImage.clone(); + + // $ExpectType -1 + cloneBaseImage.PNG_FILTER_AUTO; + + test('can handle `this` returns on the core type properly', () => { + // $ExpectType -1 + cloneBaseImage.diff(jimpInst, jimpInst).image.PNG_FILTER_AUTO + }); + + test('can handle `this` returns properly', () => { + cloneBaseImage + .resize(1, 1) + .crop(0, 0, 0, 0) + .mask(cloneBaseImage, 2, 2) + .print('a' as any, 2, 2, 'a' as any) + .resize(1, 1) + .quality(1) + .deflateLevel(2) + .PNG_FILTER_AUTO; + }); + + test('can handle imageCallbacks `this` properly', () => { + cloneBaseImage.rgba(false, (_, jimpCBIn) => { + jimpCBIn.read('Test'); + jimpCBIn.displace(jimpInst, 2); + jimpCBIn.resize(40, 40); + // $ExpectType 0 + jimpCBIn.PNG_FILTER_NONE; + + // $ExpectError + jimpCBIn.test; + + // $ExpectError + jimpCBIn.func(); + }) + }) }); diff --git a/packages/plugin-blit/index.d.ts b/packages/plugin-blit/index.d.ts index 583128019..abe5ee2c6 100644 --- a/packages/plugin-blit/index.d.ts +++ b/packages/plugin-blit/index.d.ts @@ -1,7 +1,7 @@ -import { Jimp, ImageCallback, IllformedPlugin } from '@jimp/core'; +import { Jimp, ImageCallback } from '@jimp/core'; interface Blit { - blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + blit(src: Jimp, x: number, y: number, cb?: ImageCallback): this; blit( src: Jimp, x: number, @@ -10,7 +10,7 @@ interface Blit { srcy: number, srcw: number, srch: number, - cb?: ImageCallback + cb?: ImageCallback ): this; } diff --git a/packages/plugin-blur/index.d.ts b/packages/plugin-blur/index.d.ts index d40ab0e5a..f2c1a84e0 100644 --- a/packages/plugin-blur/index.d.ts +++ b/packages/plugin-blur/index.d.ts @@ -1,7 +1,7 @@ import { ImageCallback } from '@jimp/core'; interface Blur { - blur(r: number, cb?: ImageCallback): this; + blur(r: number, cb?: ImageCallback): this; } export default function(): Blur; diff --git a/packages/plugin-circle/index.d.ts b/packages/plugin-circle/index.d.ts index eb40488df..40f249351 100644 --- a/packages/plugin-circle/index.d.ts +++ b/packages/plugin-circle/index.d.ts @@ -5,8 +5,8 @@ interface Circle { radius: number, x: number, y: number - }, cb?: ImageCallback): this; - circle(cb?: ImageCallback): this; + }, cb?: ImageCallback): this; + circle(cb?: ImageCallback): this; } export default function(): Circle; diff --git a/packages/plugin-color/index.d.ts b/packages/plugin-color/index.d.ts index 241903a44..c2f897a36 100644 --- a/packages/plugin-color/index.d.ts +++ b/packages/plugin-color/index.d.ts @@ -16,41 +16,41 @@ type ColorAction = { }; interface Color { - brightness(val: number, cb?: ImageCallback): this; - contrast(val: number, cb?: ImageCallback): this; - posterize(n: number, cb?: ImageCallback): this; - greyscale(cb?: ImageCallback): this; - grayscale(cb?: ImageCallback): this; - opacity(f: number, cb?: ImageCallback): this; - sepia(cb?: ImageCallback): this; - fade(f: number, cb?: ImageCallback): this; - convolution(kernel: number[][], cb?: ImageCallback): this; + brightness(val: number, cb?: ImageCallback): this; + contrast(val: number, cb?: ImageCallback): this; + posterize(n: number, cb?: ImageCallback): this; + greyscale(cb?: ImageCallback): this; + grayscale(cb?: ImageCallback): this; + opacity(f: number, cb?: ImageCallback): this; + sepia(cb?: ImageCallback): this; + fade(f: number, cb?: ImageCallback): this; + convolution(kernel: number[][], cb?: ImageCallback): this; convolution( kernel: number[][], edgeHandling: string, - cb?: ImageCallback + cb?: ImageCallback ): this; - opaque(cb?: ImageCallback): this; - pixelate(size: number, cb?: ImageCallback): this; + opaque(cb?: ImageCallback): this; + pixelate(size: number, cb?: ImageCallback): this; pixelate( size: number, x: number, y: number, w: number, h: number, - cb?: ImageCallback + cb?: ImageCallback ): this; - convolute(kernel: number[][], cb?: ImageCallback): this; + convolute(kernel: number[][], cb?: ImageCallback): this; convolute( kernel: number[][], x: number, y: number, w: number, h: number, - cb?: ImageCallback + cb?: ImageCallback ): this; - color(actions: ColorAction[], cb?: ImageCallback): this; - colour(actions: ColorAction[], cb?: ImageCallback): this; + color(actions: ColorAction[], cb?: ImageCallback): this; + colour(actions: ColorAction[], cb?: ImageCallback): this; } export default function(): Color; diff --git a/packages/plugin-contain/index.d.ts b/packages/plugin-contain/index.d.ts index 06d9e288a..7c5e34b06 100644 --- a/packages/plugin-contain/index.d.ts +++ b/packages/plugin-contain/index.d.ts @@ -1,15 +1,15 @@ import { ImageCallback } from '@jimp/core'; interface Contain { - contain(w: number, h: number, cb?: ImageCallback): this; - contain(w: number, h: number, mode?: string, cb?: ImageCallback): this; - contain(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; + contain(w: number, h: number, cb?: ImageCallback): this; + contain(w: number, h: number, mode?: string, cb?: ImageCallback): this; + contain(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; contain( w: number, h: number, alignBits?: number, mode?: string, - cb?: ImageCallback + cb?: ImageCallback ): this; } diff --git a/packages/plugin-cover/index.d.ts b/packages/plugin-cover/index.d.ts index 4a50f175a..192093412 100644 --- a/packages/plugin-cover/index.d.ts +++ b/packages/plugin-cover/index.d.ts @@ -1,14 +1,14 @@ import { ImageCallback } from '@jimp/core'; interface Cover { - cover(w: number, h: number, cb?: ImageCallback): this; - cover(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; + cover(w: number, h: number, cb?: ImageCallback): this; + cover(w: number, h: number, alignBits?: number, cb?: ImageCallback): this; cover( w: number, h: number, alignBits?: number, mode?: string, - cb?: ImageCallback + cb?: ImageCallback ): this; } diff --git a/packages/plugin-crop/index.d.ts b/packages/plugin-crop/index.d.ts index 91bb96521..c5c4cf2f9 100644 --- a/packages/plugin-crop/index.d.ts +++ b/packages/plugin-crop/index.d.ts @@ -1,33 +1,34 @@ import { Jimp, ImageCallback } from '@jimp/core'; -interface Crop { - class: { - crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): This; - cropQuiet( - x: number, - y: number, - w: number, - h: number, - cb?: ImageCallback - ): This; +interface CropClass { + crop(x: number, y: number, w: number, h: number, cb?: ImageCallback): this; + cropQuiet( + x: number, + y: number, + w: number, + h: number, + cb?: ImageCallback + ): this; + autocrop(tolerance?: number, cb?: ImageCallback): this; + autocrop(cropOnlyFrames?: boolean, cb?: ImageCallback): this; + autocrop( + tolerance?: number, + cropOnlyFrames?: boolean, + cb?: ImageCallback + ): this; + autocrop( + options: { + tolerance?: number; + cropOnlyFrames?: boolean; + cropSymmetric?: boolean; + leaveBorder?: number; + }, + cb?: ImageCallback + ): this; +} - autocrop(tolerance?: number, cb?: ImageCallback): This; - autocrop(cropOnlyFrames?: boolean, cb?: ImageCallback): This; - autocrop( - tolerance?: number, - cropOnlyFrames?: boolean, - cb?: ImageCallback - ): This; - autocrop( - options: { - tolerance?: number; - cropOnlyFrames?: boolean; - cropSymmetric?: boolean; - leaveBorder?: number; - }, - cb?: ImageCallback - ): This; - } +interface Crop { + class: CropClass } export default function(): Crop; diff --git a/packages/plugin-displace/index.d.ts b/packages/plugin-displace/index.d.ts index e2634b65d..d9f8652ff 100644 --- a/packages/plugin-displace/index.d.ts +++ b/packages/plugin-displace/index.d.ts @@ -1,7 +1,7 @@ -import { Jimp, ImageCallback, IllformedPlugin } from '@jimp/core'; +import { Jimp, ImageCallback } from '@jimp/core'; interface Displace { - displace(map: Jimp, offset: number, cb?: ImageCallback): this; + displace(map: Jimp, offset: number, cb?: ImageCallback): this; } export default function(): Displace; diff --git a/packages/plugin-dither/index.d.ts b/packages/plugin-dither/index.d.ts index 34d40b0b3..5b00858c6 100644 --- a/packages/plugin-dither/index.d.ts +++ b/packages/plugin-dither/index.d.ts @@ -1,8 +1,8 @@ import { ImageCallback } from '@jimp/core'; interface Dither { - dither565(cb?: ImageCallback): this; - dither16(cb?: ImageCallback): this; + dither565(cb?: ImageCallback): this; + dither16(cb?: ImageCallback): this; } export default function(): Dither; diff --git a/packages/plugin-fisheye/index.d.ts b/packages/plugin-fisheye/index.d.ts index 6944a727b..d8140192b 100644 --- a/packages/plugin-fisheye/index.d.ts +++ b/packages/plugin-fisheye/index.d.ts @@ -1,8 +1,8 @@ import { ImageCallback } from '@jimp/core'; interface Fisheye { - fishEye(opts?: { r: number }, cb?: ImageCallback): this; - fishEye(cb?: ImageCallback): this; + fishEye(opts?: { r: number }, cb?: ImageCallback): this; + fishEye(cb?: ImageCallback): this; } export default function(): Fisheye; diff --git a/packages/plugin-flip/index.d.ts b/packages/plugin-flip/index.d.ts index 24eef6765..17b107d44 100644 --- a/packages/plugin-flip/index.d.ts +++ b/packages/plugin-flip/index.d.ts @@ -1,8 +1,8 @@ import { ImageCallback } from '@jimp/core'; interface Flip { - flip(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; - mirror(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; + flip(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; + mirror(horizontal: boolean, vertical: boolean, cb?: ImageCallback): this; } export default function(): Flip; diff --git a/packages/plugin-gaussian/index.d.ts b/packages/plugin-gaussian/index.d.ts index 8c91fbbf6..7f4157752 100644 --- a/packages/plugin-gaussian/index.d.ts +++ b/packages/plugin-gaussian/index.d.ts @@ -1,7 +1,7 @@ import { ImageCallback } from '@jimp/core'; interface Gaussian { - gaussian(r: number, cb?: ImageCallback): this; + gaussian(r: number, cb?: ImageCallback): this; } export default function(): Gaussian; diff --git a/packages/plugin-invert/index.d.ts b/packages/plugin-invert/index.d.ts index 89423ae40..654051c34 100644 --- a/packages/plugin-invert/index.d.ts +++ b/packages/plugin-invert/index.d.ts @@ -1,7 +1,7 @@ import { ImageCallback } from '@jimp/core'; interface Invert { - invert(cb?: ImageCallback): this; + invert(cb?: ImageCallback): this; } export default function(): Invert; diff --git a/packages/plugin-mask/index.d.ts b/packages/plugin-mask/index.d.ts index fb4360f9c..01092b812 100644 --- a/packages/plugin-mask/index.d.ts +++ b/packages/plugin-mask/index.d.ts @@ -1,7 +1,7 @@ -import { IllformedPlugin, ImageCallback, Jimp } from '@jimp/core'; +import { ImageCallback, Jimp } from '@jimp/core'; interface Mask { - mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; + mask(src: Jimp, x: number, y: number, cb?: ImageCallback): this; } export default function(): Mask; diff --git a/packages/plugin-normalize/index.d.ts b/packages/plugin-normalize/index.d.ts index a140288cf..abdf1839c 100644 --- a/packages/plugin-normalize/index.d.ts +++ b/packages/plugin-normalize/index.d.ts @@ -1,7 +1,7 @@ import { ImageCallback } from '@jimp/core'; interface Normalize { - normalize(cb ?: ImageCallback): this; + normalize(cb ?: ImageCallback): this; } export default function(): Normalize; diff --git a/packages/plugin-print/index.d.ts b/packages/plugin-print/index.d.ts index 2fda985e5..1380b71f4 100644 --- a/packages/plugin-print/index.d.ts +++ b/packages/plugin-print/index.d.ts @@ -1,4 +1,4 @@ -import { Jimp, GenericCallback, ImageCallback } from '@jimp/core'; +import { GenericCallback, ImageCallback } from '@jimp/core'; export interface FontChar { id: number; @@ -62,7 +62,35 @@ type PrintableText = alignmentY: number; }; -interface Print { +interface PrintClass { + // Text methods + print( + font: Font, + x: number, + y: number, + text: PrintableText, + cb?: ImageCallback + ): this; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + cb?: ImageCallback + ): this; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + maxHeight?: number, + cb?: ImageCallback + ): this; +} + +interface Print { constants: { measureText(font: Font, text: PrintableText): number; measureTextHeight(font: Font, text: PrintableText, maxWidth: number): number; @@ -87,33 +115,7 @@ interface Print { loadFont(file: string, cb: GenericCallback): Promise; } - class: { - // Text methods - print( - font: Font, - x: number, - y: number, - text: PrintableText, - cb?: ImageCallback - ): This; - print( - font: Font, - x: number, - y: number, - text: PrintableText, - maxWidth?: number, - cb?: ImageCallback - ): This; - print( - font: Font, - x: number, - y: number, - text: PrintableText, - maxWidth?: number, - maxHeight?: number, - cb?: ImageCallback - ): This; - } + class: PrintClass } export default function(): Print; diff --git a/packages/plugin-resize/index.d.ts b/packages/plugin-resize/index.d.ts index 30a70eac2..24349ad2e 100644 --- a/packages/plugin-resize/index.d.ts +++ b/packages/plugin-resize/index.d.ts @@ -1,6 +1,11 @@ -import { Jimp, ImageCallback } from '@jimp/core'; +import { ImageCallback } from '@jimp/core'; -interface Resize { +interface ResizeClass { + resize(w: number, h: number, cb?: ImageCallback): this; + resize(w: number, h: number, mode?: string, cb?: ImageCallback): this; +} + +interface Resize { constants: { // resize methods RESIZE_NEAREST_NEIGHBOR: 'nearestNeighbor'; @@ -10,10 +15,7 @@ interface Resize { RESIZE_BEZIER: 'bezierInterpolation'; } - class: { - resize(w: number, h: number, cb?: ImageCallback): This; - resize(w: number, h: number, mode?: string, cb?: ImageCallback): This; - } + class: ResizeClass } export default function(): Resize; diff --git a/packages/plugin-rotate/index.d.ts b/packages/plugin-rotate/index.d.ts index 2528e252c..8cc783de4 100644 --- a/packages/plugin-rotate/index.d.ts +++ b/packages/plugin-rotate/index.d.ts @@ -1,8 +1,8 @@ import { ImageCallback } from '@jimp/core'; interface Rotate { - rotate(deg: number, cb?: ImageCallback): this; - rotate(deg: number, mode: string | boolean, cb?: ImageCallback): this; + rotate(deg: number, cb?: ImageCallback): this; + rotate(deg: number, mode: string | boolean, cb?: ImageCallback): this; } export default function(): Rotate; diff --git a/packages/plugin-scale/index.d.ts b/packages/plugin-scale/index.d.ts index 06176a1bf..dcf581805 100644 --- a/packages/plugin-scale/index.d.ts +++ b/packages/plugin-scale/index.d.ts @@ -1,10 +1,10 @@ import { ImageCallback } from '@jimp/core'; interface Scale { - scale(f: number, cb?: ImageCallback): this; - scale(f: number, mode?: string, cb?: ImageCallback): this; - scaleToFit(w: number, h: number, cb?: ImageCallback): this; - scaleToFit(w: number, h: number, mode?: string, cb?: ImageCallback): this; + scale(f: number, cb?: ImageCallback): this; + scale(f: number, mode?: string, cb?: ImageCallback): this; + scaleToFit(w: number, h: number, cb?: ImageCallback): this; + scaleToFit(w: number, h: number, mode?: string, cb?: ImageCallback): this; } export default function(): Scale; diff --git a/packages/plugin-shadow/index.d.ts b/packages/plugin-shadow/index.d.ts index 81a13f19c..c2611bf4b 100644 --- a/packages/plugin-shadow/index.d.ts +++ b/packages/plugin-shadow/index.d.ts @@ -7,8 +7,8 @@ interface Shadow { x?: number, y?: number }, - cb?: ImageCallback): this; - shadow(cb?: ImageCallback): this; + cb?: ImageCallback): this; + shadow(cb?: ImageCallback): this; } export default function(): Shadow; diff --git a/packages/plugin-threshold/index.d.ts b/packages/plugin-threshold/index.d.ts index 527f1a229..4b2a6cbea 100644 --- a/packages/plugin-threshold/index.d.ts +++ b/packages/plugin-threshold/index.d.ts @@ -5,7 +5,7 @@ interface Threshold { max: number, replace?: number, autoGreyscale?: boolean - }, cb?: ImageCallback): this; + }, cb?: ImageCallback): this; } export default function(): Threshold; diff --git a/packages/type-jpeg/index.d.ts b/packages/type-jpeg/index.d.ts index 0fc8e66c9..9460dbe95 100644 --- a/packages/type-jpeg/index.d.ts +++ b/packages/type-jpeg/index.d.ts @@ -1,6 +1,12 @@ -import { Jimp, DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; +import { DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; -interface Jpeg { +interface JpegClass { + MIME_JPEG: 'image/jpeg'; + _quality: number; + quality: (n: number, cb?: ImageCallback) => this; +} + +interface Jpeg { mime: { 'image/jpeg': string[] }, constants: { @@ -15,11 +21,7 @@ interface Jpeg { 'image/jpeg': DecoderFn } - class: { - MIME_JPEG: 'image/jpeg'; - _quality: number; - quality: (n: number, cb?: ImageCallback) => This; - } + class: JpegClass } export default function(): Jpeg; diff --git a/packages/type-png/index.d.ts b/packages/type-png/index.d.ts index 37bd1e72d..945db8ec8 100644 --- a/packages/type-png/index.d.ts +++ b/packages/type-png/index.d.ts @@ -1,6 +1,17 @@ -import { Jimp, DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; +import { DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; -interface PNG { +interface PNGClass { + _deflateLevel: number, + _deflateStrategy: number, + _filterType: number, + _colorType: number, + deflateLevel(l: number, cb?: ImageCallback): this; + deflateStrategy(s: number, cb?: ImageCallback): this; + filterType(f: number, cb?: ImageCallback): this; + colorType(s: number, cb?: ImageCallback): this; +} + +interface PNG { mime: { 'image/png': string[] }, @@ -13,16 +24,8 @@ interface PNG { 'image/png': EncoderFn } - class: { - _deflateLevel: number, - _deflateStrategy: number, - _filterType: number, - _colorType: number, - deflateLevel(l: number, cb?: ImageCallback): This; - deflateStrategy(s: number, cb?: ImageCallback): This; - filterType(f: number, cb?: ImageCallback): This; - colorType(s: number, cb?: ImageCallback): This; - } + class: PNGClass + constants: { MIME_PNG: 'image/png'; // PNG filter types diff --git a/yarn.lock b/yarn.lock index 362b515ad..d3a8a669a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9097,9 +9097,10 @@ typescript-memoize@^1.0.0-alpha.3: dependencies: core-js "2.4.1" -typescript@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8" +typescript@^3.1.3: + version "3.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da" + integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw== typescript@next: version "3.7.0-dev.20190907" From e44272c541833cc441e672beb2dd51b0bb4a46b1 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 20 Sep 2019 16:23:53 +0000 Subject: [PATCH 017/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdc0fecb9..8a84e34e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.8.4 (Fri Sep 20 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/jpeg`, `@jimp/png` + - TS 3.1 fixed [#798](https://github.com/oliver-moran/jimp/pull/798) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.8.3 (Wed Sep 18 2019) #### 🐛 Bug Fix From ee5a809cae7cb7cc8c017e2eca935e17fd6bb5d4 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 20 Sep 2019 16:23:55 +0000 Subject: [PATCH 018/223] Bump version to: 0.8.4 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index 24f2e4306..be33ce2f7 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.8.3" + "version": "0.8.4" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 416f019f9..a06a0dfe9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.8.3", + "version": "0.8.4", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.3", + "@jimp/custom": "^0.8.4", "chalk": "^2.4.1", - "jimp": "^0.8.3", + "jimp": "^0.8.4", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index f446e628a..b21b67041 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.8.3", + "version": "0.8.4", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -34,7 +34,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index 0ef8f2a1f..66ce33536 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.8.3", + "version": "0.8.4", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.8.3", + "@jimp/core": "^0.8.4", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index a516ef301..945e338d3 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.8.3", + "version": "0.8.4", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -59,14 +59,14 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/plugins": "^0.8.3", - "@jimp/types": "^0.8.3", + "@jimp/custom": "^0.8.4", + "@jimp/plugins": "^0.8.4", + "@jimp/types": "^0.8.4", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@jimp/test-utils": "^0.8.3", + "@jimp/test-utils": "^0.8.4", "babelify": "^10.0.0", "browserify": "^16.2.2", "envify": "^4.1.0", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 9c8118126..97c1dddb1 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.8.3", + "version": "0.8.4", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/jpeg": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/jpeg": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 8b741b3ab..36f888914 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.8.3", + "version": "0.8.4", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 8305ff611..d816d5c16 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.8.3", + "version": "0.8.4", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index c2e4e9df9..174583cd8 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.8.3", + "version": "0.8.4", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3", - "@jimp/types": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4", + "@jimp/types": "^0.8.4" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 2b35f18c9..28245f437 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.8.3", + "version": "0.8.4", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/plugin-blit": "^0.8.3", - "@jimp/plugin-resize": "^0.8.3", - "@jimp/plugin-scale": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/plugin-blit": "^0.8.4", + "@jimp/plugin-resize": "^0.8.4", + "@jimp/plugin-scale": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 115dfb1b8..2d753c7c4 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.8.3", + "version": "0.8.4", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/plugin-crop": "^0.8.3", - "@jimp/plugin-resize": "^0.8.3", - "@jimp/plugin-scale": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/plugin-crop": "^0.8.4", + "@jimp/plugin-resize": "^0.8.4", + "@jimp/plugin-scale": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index d7a87942a..7ed15019c 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.8.3", + "version": "0.8.4", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 57bf5ca80..d9d96f2ac 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.8.3", + "version": "0.8.4", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index c5501fc7e..ca0a7a61f 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.8.3", + "version": "0.8.4", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index ca422b74d..c2f14f61d 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.8.3", + "version": "0.8.4", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 065e8324c..c86c0c3c6 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.8.3", + "version": "0.8.4", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index d2af568d7..07808f431 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.8.3", + "version": "0.8.4", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 4bb408d99..446e53c09 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.8.3", + "version": "0.8.4", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 713a837d7..ffca9d079 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.8.3", + "version": "0.8.4", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 9f00b9e6a..3dc886c11 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.8.3", + "version": "0.8.4", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 560e6fb6e..d00da5819 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.8.3", + "version": "0.8.4", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/plugin-blit": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/plugin-blit": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 4d8c0239f..e0cc81395 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.8.3", + "version": "0.8.4", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index b9ac15fd6..a2935d9f9 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.8.3", + "version": "0.8.4", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/plugin-blit": "^0.8.3", - "@jimp/plugin-crop": "^0.8.3", - "@jimp/plugin-resize": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/plugin-blit": "^0.8.4", + "@jimp/plugin-crop": "^0.8.4", + "@jimp/plugin-resize": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index a6d511fb5..8aea39137 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.8.3", + "version": "0.8.4", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 349f27754..517dbd743 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.8.3", + "version": "0.8.4", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/plugin-blur": "^0.8.3", - "@jimp/plugin-resize": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/plugin-blur": "^0.8.4", + "@jimp/plugin-resize": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 71bfc305b..298a2d53a 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.8.3", + "version": "0.8.4", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/jpeg": "^0.8.3", - "@jimp/plugin-color": "^0.8.3", - "@jimp/plugin-resize": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/jpeg": "^0.8.4", + "@jimp/plugin-color": "^0.8.4", + "@jimp/plugin-resize": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 0e030f87f..dc702e1e0 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.8.3", - "@jimp/plugin-blur": "^0.8.3", - "@jimp/plugin-color": "^0.8.3", - "@jimp/plugin-contain": "^0.8.3", - "@jimp/plugin-cover": "^0.8.3", - "@jimp/plugin-crop": "^0.8.3", - "@jimp/plugin-displace": "^0.8.3", - "@jimp/plugin-dither": "^0.8.3", - "@jimp/plugin-flip": "^0.8.3", - "@jimp/plugin-gaussian": "^0.8.3", - "@jimp/plugin-invert": "^0.8.3", - "@jimp/plugin-mask": "^0.8.3", - "@jimp/plugin-normalize": "^0.8.3", - "@jimp/plugin-print": "^0.8.3", - "@jimp/plugin-resize": "^0.8.3", - "@jimp/plugin-rotate": "^0.8.3", - "@jimp/plugin-scale": "^0.8.3", + "@jimp/plugin-blit": "^0.8.4", + "@jimp/plugin-blur": "^0.8.4", + "@jimp/plugin-color": "^0.8.4", + "@jimp/plugin-contain": "^0.8.4", + "@jimp/plugin-cover": "^0.8.4", + "@jimp/plugin-crop": "^0.8.4", + "@jimp/plugin-displace": "^0.8.4", + "@jimp/plugin-dither": "^0.8.4", + "@jimp/plugin-flip": "^0.8.4", + "@jimp/plugin-gaussian": "^0.8.4", + "@jimp/plugin-invert": "^0.8.4", + "@jimp/plugin-mask": "^0.8.4", + "@jimp/plugin-normalize": "^0.8.4", + "@jimp/plugin-print": "^0.8.4", + "@jimp/plugin-resize": "^0.8.4", + "@jimp/plugin-rotate": "^0.8.4", + "@jimp/plugin-scale": "^0.8.4", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 2d66c6614..04043746d 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.8.3", + "version": "0.8.4", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.8.3", + "@jimp/custom": "^0.8.4", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 8e8710894..cd839c10f 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 6d4207c7e..7504eb72f 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 8cca0ebdf..468a19edb 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index be9fcf5ad..41159e91d 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.3", + "@jimp/utils": "^0.8.4", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index e5ddabc27..6ec411082 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.3", - "@jimp/test-utils": "^0.8.3" + "@jimp/custom": "^0.8.4", + "@jimp/test-utils": "^0.8.4" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index cb5549bd4..bae5f9ef6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.8.3", + "version": "0.8.4", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.8.3", - "@jimp/gif": "^0.8.3", - "@jimp/jpeg": "^0.8.3", - "@jimp/png": "^0.8.3", - "@jimp/tiff": "^0.8.3", + "@jimp/bmp": "^0.8.4", + "@jimp/gif": "^0.8.4", + "@jimp/jpeg": "^0.8.4", + "@jimp/png": "^0.8.4", + "@jimp/tiff": "^0.8.4", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 1873db554..62ea908e4 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.8.3", + "version": "0.8.4", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 3b58221c3e1f97e321c0e9b907dfb6ded1ef413f Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Mon, 23 Sep 2019 08:45:09 -0700 Subject: [PATCH 019/223] Added back mention of required tsconfig options (#800) --- packages/jimp/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/jimp/README.md b/packages/jimp/README.md index 3ff32cb6a..36399abb8 100644 --- a/packages/jimp/README.md +++ b/packages/jimp/README.md @@ -63,7 +63,11 @@ If you're using this library with TypeScript the method of importing slightly di import Jimp from 'jimp'; ``` -**Note**: This change in import does not change the runtime behavior of your code at all. +This requires setting the `allowSyntheticDefaultImports` compiler option to `true` in your `tsconfig` + +**Note 1**: `esModuleInterop` implicitly sets `allowSyntheticDefaultImports` to `true` + +**Note 2**: `allowSyntheticDefaultImports` nor `esModuleInterop` change the runtime behavior of your code at all. They are just flags that tells TypeScript you need the compatibility they offer. ## Module Build From 29679faa597228ff2f20d34c5758e4d2257065a3 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Tue, 24 Sep 2019 14:16:49 -0700 Subject: [PATCH 020/223] Upgrade nearly-all dev deps (#799) * Upgrade nearly-all dev deps * Revert node8 breaking change dep upgrade * Fix issues with new `xo` version * Revert 'auto' due to failing release * :pray: * run without cache --- .circleci/config.yml | 10 - package.json | 59 +- packages/cli/package.json | 2 +- packages/core/src/index.js | 1 + packages/core/src/modules/phash.js | 62 +- packages/jimp/package.json | 35 +- packages/jimp/test/callbacks.test.js | 1 + packages/jimp/test/filetypes.test.js | 2 - packages/jimp/test/hash.test.js | 2 - packages/jimp/tools/browser-build.js | 1 + packages/plugin-blit/test/blit.test.js | 1 + packages/plugin-blur/src/index.js | 1 + packages/plugin-color/src/index.js | 1 + packages/plugin-crop/src/index.js | 4 + packages/plugin-normalize/src/index.js | 2 - packages/plugin-resize/src/modules/resize.js | 7 + packages/plugin-resize/src/modules/resize2.js | 4 + packages/plugin-resize/test/resize.test.js | 1 + packages/plugin-rotate/src/index.js | 1 + packages/test-utils/src/index.js | 4 +- packages/test-utils/src/jgd.js | 1 + packages/type-jpeg/test/jpeg.test.js | 2 - packages/type-png/test/png.test.js | 2 - packages/type-tiff/test/tiff.test.js | 2 - packages/types/package.json | 2 +- yarn.lock | 7350 ++++++++++------- 26 files changed, 4311 insertions(+), 3249 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 05cfb164c..3f8c38ef5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,16 +10,6 @@ jobs: <<: *defaults steps: - checkout - - restore_cache: - keys: - # Find a cache corresponding to this specific package.json checksum - # when this file is changed, this key will fail - - jimp-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum ".circleci/config.yml" }} - - jimp-{{ .Branch }}-{{ checksum "yarn.lock" }} - - jimp-{{ .Branch }} - # Find the most recent cache used from any branch - - jimp-master - - jimp- - run: name: Install Dependencies command: yarn install --frozen-lockfile diff --git a/package.json b/package.json index b27290776..642b1d2ab 100644 --- a/package.json +++ b/package.json @@ -25,39 +25,40 @@ "tsTest:main": "dtslint packages/jimp/types --expectOnly" }, "devDependencies": { - "@babel/cli": "^7.1.0", - "@babel/core": "^7.1.0", - "@babel/plugin-proposal-class-properties": "^7.1.0", - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "@babel/preset-env": "^7.1.0", - "@babel/register": "^7.0.0", - "auto": "^7.4.1", - "babel-eslint": "^9.0.0", - "babel-plugin-add-module-exports": "^1.0.0", - "babel-plugin-istanbul": "^5.0.1", - "babel-plugin-source-map-support": "^2.0.1", + "@babel/cli": "^7.6.0", + "@babel/core": "^7.6.0", + "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/plugin-syntax-object-rest-spread": "^7.2.0", + "@babel/preset-env": "^7.6.0", + "@babel/register": "^7.6.0", + "auto": "^7.6.0", + "babel-eslint": "^10.0.3", + "babel-plugin-add-module-exports": "^1.0.2", + "babel-plugin-istanbul": "^5.2.0", + "babel-plugin-source-map-support": "^2.1.1", "babel-plugin-transform-inline-environment-variables": "^0.4.3", - "cross-env": "^5.2.0", - "dtslint": "^0.9.6", - "eslint-plugin-prettier": "^2.6.2", - "express": "^4.16.3", - "husky": "^1.0.0-rc.15", - "karma": "^3.0.0", - "karma-browserify": "^5.3.0", - "karma-chrome-launcher": "^2.2.0", - "karma-firefox-launcher": "^1.1.0", + "cross-env": "^6.0.0", + "dtslint": "^0.9.8", + "eslint": "^6.4.0", + "eslint-config-prettier": "^6.3.0", + "express": "^4.17.1", + "husky": "^3.0.5", + "karma": "^4.3.0", + "karma-browserify": "^6.1.0", + "karma-chrome-launcher": "^3.1.0", + "karma-firefox-launcher": "^1.2.0", "karma-mocha": "^1.3.0", "karma-mocha-reporter": "^2.2.5", - "lerna": "^3.13.4", - "lerna-changelog": "^0.8.0", - "lint-staged": "^7.3.0", - "mocha": "^5.2.0", - "nyc": "^13.0.1", - "prettier": "^1.14.3", + "lerna": "^3.16.4", + "lerna-changelog": "^0.8.2", + "lint-staged": "^9.2.5", + "mocha": "^6.2.0", + "nyc": "^14.1.1", + "prettier": "^1.18.2", "should": "^13.2.3", - "source-map-support": "^0.5.9", - "watchify": "^3.11.0", - "xo": "^0.23.0" + "source-map-support": "^0.5.13", + "watchify": "^3.11.1", + "xo": "^0.24.0" }, "auto": { "plugins": [ diff --git a/packages/cli/package.json b/packages/cli/package.json index a06a0dfe9..799053a0c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@types/log-symbols": "^2.0.0", - "@types/mocha": "^5.2.5", + "@types/mocha": "^5.2.7", "@types/yargs": "^11.1.1", "ts-node": "^7.0.1", "typescript": "^3.1.3" diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 6e07836cc..58a984478 100755 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -1125,6 +1125,7 @@ export function jimpEvMethod(methodName, evName, method) { cb.apply(this, args); }; + args[args.length - 1] = wrappedCb; } else { wrappedCb = false; diff --git a/packages/core/src/modules/phash.js b/packages/core/src/modules/phash.js index 080347fde..100bc1e8c 100644 --- a/packages/core/src/modules/phash.js +++ b/packages/core/src/modules/phash.js @@ -45,23 +45,24 @@ ImagePHash.prototype.distance = function(s1, s2) { counter++; } } + return counter / s1.length; }; // Returns a 'binary string' (like. 001010111011100010) which is easy to do a hamming distance on. ImagePHash.prototype.getHash = function(img) { /* 1. Reduce size. - * Like Average Hash, pHash starts with a small image. - * However, the image is larger than 8x8; 32x32 is a good size. - * This is really done to simplify the DCT computation and not - * because it is needed to reduce the high frequencies. - */ + * Like Average Hash, pHash starts with a small image. + * However, the image is larger than 8x8; 32x32 is a good size. + * This is really done to simplify the DCT computation and not + * because it is needed to reduce the high frequencies. + */ img = img.clone().resize(this.size, this.size); /* 2. Reduce color. - * The image is reduced to a grayscale just to further simplify - * the number of computations. - */ + * The image is reduced to a grayscale just to further simplify + * the number of computations. + */ img.grayscale(); const vals = []; @@ -74,23 +75,23 @@ ImagePHash.prototype.getHash = function(img) { } /* 3. Compute the DCT. - * The DCT separates the image into a collection of frequencies - * and scalars. While JPEG uses an 8x8 DCT, this algorithm uses - * a 32x32 DCT. - */ + * The DCT separates the image into a collection of frequencies + * and scalars. While JPEG uses an 8x8 DCT, this algorithm uses + * a 32x32 DCT. + */ const dctVals = applyDCT(vals, this.size); /* 4. Reduce the DCT. - * This is the magic step. While the DCT is 32x32, just keep the - * top-left 8x8. Those represent the lowest frequencies in the - * picture. - */ + * This is the magic step. While the DCT is 32x32, just keep the + * top-left 8x8. Those represent the lowest frequencies in the + * picture. + */ /* 5. Compute the average value. - * Like the Average Hash, compute the mean DCT value (using only - * the 8x8 DCT low-frequency values and excluding the first term - * since the DC coefficient can be significantly different from - * the other values and will throw off the average). - */ + * Like the Average Hash, compute the mean DCT value (using only + * the 8x8 DCT low-frequency values and excluding the first term + * since the DC coefficient can be significantly different from + * the other values and will throw off the average). + */ let total = 0; for (let x = 0; x < this.smallerSize; x++) { @@ -102,15 +103,15 @@ ImagePHash.prototype.getHash = function(img) { const avg = total / (this.smallerSize * this.smallerSize); /* 6. Further reduce the DCT. - * This is the magic step. Set the 64 hash bits to 0 or 1 - * depending on whether each of the 64 DCT values is above or - * below the average value. The result doesn't tell us the - * actual low frequencies; it just tells us the very-rough - * relative scale of the frequencies to the mean. The result - * will not vary as long as the overall structure of the image - * remains the same; this can survive gamma and color histogram - * adjustments without a problem. - */ + * This is the magic step. Set the 64 hash bits to 0 or 1 + * depending on whether each of the 64 DCT values is above or + * below the average value. The result doesn't tell us the + * actual low frequencies; it just tells us the very-rough + * relative scale of the frequencies to the mean. The result + * will not vary as long as the overall structure of the image + * remains the same; this can survive gamma and color histogram + * adjustments without a problem. + */ let hash = ''; for (let x = 0; x < this.smallerSize; x++) { @@ -169,6 +170,7 @@ function applyDCT(f, size) { f[i][j]; } } + sum *= (c[u] * c[v]) / 4; F[u][v] = sum; } diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 945e338d3..d66c08095 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -66,13 +66,42 @@ "regenerator-runtime": "^0.13.3" }, "devDependencies": { + "@babel/cli": "^7.6.0", + "@babel/core": "^7.6.0", + "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/plugin-syntax-object-rest-spread": "^7.2.0", + "@babel/preset-env": "^7.6.0", + "@babel/register": "^7.6.0", "@jimp/test-utils": "^0.8.4", + "auto": "^7.6.0", + "babel-eslint": "^10.0.3", + "babel-plugin-add-module-exports": "^1.0.2", + "babel-plugin-istanbul": "^5.2.0", + "babel-plugin-source-map-support": "^2.1.1", "babelify": "^10.0.0", - "browserify": "^16.2.2", + "browserify": "^16.5.0", + "cross-env": "^6.0.0", + "dtslint": "^0.9.8", "envify": "^4.1.0", - "express": "^4.16.3", + "eslint": "^6.4.0", + "eslint-plugin-prettier": "^3.1.1", + "express": "^4.17.1", + "husky": "^3.0.5", + "karma": "^4.3.0", + "karma-browserify": "^6.1.0", + "karma-chrome-launcher": "^3.1.0", + "karma-firefox-launcher": "^1.2.0", + "lerna": "^3.16.4", + "lerna-changelog": "^0.8.2", + "lint-staged": "^9.2.5", + "mocha": "^6.2.0", + "nyc": "^14.1.1", + "prettier": "^1.18.2", + "source-map-support": "^0.5.13", "tfilter": "^1.0.1", - "uglify-js": "^3.4.9" + "uglify-js": "^3.6.0", + "watchify": "^3.11.1", + "xo": "^0.24.0" }, "xo": false, "nyc": { diff --git a/packages/jimp/test/callbacks.test.js b/packages/jimp/test/callbacks.test.js index 22e11d222..ccf8f35b1 100644 --- a/packages/jimp/test/callbacks.test.js +++ b/packages/jimp/test/callbacks.test.js @@ -279,6 +279,7 @@ describe('Callbacks', () => { image.getJGDSync().should.be.sameJGD(result); done(); } + targetImg.clone()[op](...args.concat(save)); }); } diff --git a/packages/jimp/test/filetypes.test.js b/packages/jimp/test/filetypes.test.js index e56a745ba..1c67245a4 100644 --- a/packages/jimp/test/filetypes.test.js +++ b/packages/jimp/test/filetypes.test.js @@ -1,5 +1,3 @@ -/* eslint-disable no-control-regex */ - import fs from 'fs'; import should from 'should'; import { Jimp, getTestDir } from '@jimp/test-utils'; diff --git a/packages/jimp/test/hash.test.js b/packages/jimp/test/hash.test.js index 74b6ac0f9..79f3afcce 100644 --- a/packages/jimp/test/hash.test.js +++ b/packages/jimp/test/hash.test.js @@ -1,5 +1,3 @@ -/* eslint-disable no-control-regex */ - import { Jimp, getTestDir } from '@jimp/test-utils'; import configure from '@jimp/custom'; import types from '@jimp/types'; diff --git a/packages/jimp/tools/browser-build.js b/packages/jimp/tools/browser-build.js index feb4437b8..8119ede23 100755 --- a/packages/jimp/tools/browser-build.js +++ b/packages/jimp/tools/browser-build.js @@ -100,6 +100,7 @@ if (!module.parent) { config = {}; baseFiles = process.argv.slice(3); } + if (baseFiles.length === 0) throw new Error('No file given.'); bundle(baseFiles, config, (err, code) => { if (err) throw err; diff --git a/packages/plugin-blit/test/blit.test.js b/packages/plugin-blit/test/blit.test.js index 806400802..94a372f7f 100644 --- a/packages/plugin-blit/test/blit.test.js +++ b/packages/plugin-blit/test/blit.test.js @@ -199,6 +199,7 @@ describe('Blit over image', function() { imgHeight ); } + newImage.blit( head, butt.bitmap.width + fuzz.bitmap.width * longCat, diff --git a/packages/plugin-blur/src/index.js b/packages/plugin-blur/src/index.js index b8e97036a..e5ab8ea9a 100644 --- a/packages/plugin-blur/src/index.js +++ b/packages/plugin-blur/src/index.js @@ -113,6 +113,7 @@ export default () => ({ yi++; } + yw += this.bitmap.width << 2; } diff --git a/packages/plugin-color/src/index.js b/packages/plugin-color/src/index.js index bbb2d6330..faec203b9 100644 --- a/packages/plugin-color/src/index.js +++ b/packages/plugin-color/src/index.js @@ -14,6 +14,7 @@ function applyKernel(im, kernel, x, y) { value[2] += im.bitmap.data[idx + 2] * kernel[kx][ky]; } } + return value; } diff --git a/packages/plugin-crop/src/index.js b/packages/plugin-crop/src/index.js index 273e677da..2ab8ca957 100644 --- a/packages/plugin-crop/src/index.js +++ b/packages/plugin-crop/src/index.js @@ -143,6 +143,7 @@ export default function pluginCrop(event) { break north; } } + // this row contains all pixels with the same color: increment this side pixels to crop northPixelsToCrop++; } @@ -159,6 +160,7 @@ export default function pluginCrop(event) { break east; } } + // this column contains all pixels with the same color: increment this side pixels to crop eastPixelsToCrop++; } @@ -179,6 +181,7 @@ export default function pluginCrop(event) { break south; } } + // this row contains all pixels with the same color: increment this side pixels to crop southPixelsToCrop++; } @@ -199,6 +202,7 @@ export default function pluginCrop(event) { break west; } } + // this column contains all pixels with the same color: increment this side pixels to crop westPixelsToCrop++; } diff --git a/packages/plugin-normalize/src/index.js b/packages/plugin-normalize/src/index.js index 08eeafcd1..ba73ff42f 100644 --- a/packages/plugin-normalize/src/index.js +++ b/packages/plugin-normalize/src/index.js @@ -1,5 +1,3 @@ -/* eslint-disable no-labels */ - import { isNodePattern } from '@jimp/utils'; /** diff --git a/packages/plugin-resize/src/modules/resize.js b/packages/plugin-resize/src/modules/resize.js index 4e1374427..3e6de412a 100644 --- a/packages/plugin-resize/src/modules/resize.js +++ b/packages/plugin-resize/src/modules/resize.js @@ -18,6 +18,7 @@ function Resize( this.interpolationPass = Boolean(interpolationPass); this.resizeCallback = typeof resizeCallback === 'function' ? resizeCallback : function() {}; + this.targetWidthMultipliedByChannels = this.targetWidth * this.colorChannels; this.originalWidthMultipliedByChannels = this.widthOriginal * this.colorChannels; @@ -63,6 +64,7 @@ Resize.prototype.configurePasses = function() { this.colorChannels === 4 ? this.resizeWidthRGBA : this.resizeWidthRGB; } } + if (this.heightOriginal === this.targetHeight) { // Bypass the height resizer pass: this.resizeHeight = this.bypassResizer; @@ -114,6 +116,7 @@ Resize.prototype._resizeWidthInterpolatedRGBChannels = function( outputBuffer[finalOffset + 3] = buffer[pixelOffset + 3]; } } + // Adjust for overshoot of the last pass's counter: weight -= 1 / 3; let interpolationWidthSourceReadStop; @@ -234,6 +237,7 @@ Resize.prototype._resizeWidthRGBChannels = function(buffer, fourthChannel) { trustworthyColorsCount[line / channelsNum - 1] += a ? multiplier : 0; } } + if (weight >= amountToNext) { actualPosition += channelsNum; currentPosition = actualPosition; @@ -267,6 +271,7 @@ Resize.prototype._resizeWidthRGBChannels = function(buffer, fourthChannel) { outputOffset += channelsNum; } while (outputOffset < this.targetWidthMultipliedByChannels); + return outputBuffer; }; @@ -442,6 +447,7 @@ Resize.prototype.resizeHeightInterpolated = function(buffer) { ); } } + // Handle for only one interpolation input being valid for end calculation: while (finalOffset < this.finalResultSize) { for ( @@ -457,6 +463,7 @@ Resize.prototype.resizeHeightInterpolated = function(buffer) { ); } } + return outputBuffer; }; diff --git a/packages/plugin-resize/src/modules/resize2.js b/packages/plugin-resize/src/modules/resize2.js index 5944b34b3..1e54df8c5 100644 --- a/packages/plugin-resize/src/modules/resize2.js +++ b/packages/plugin-resize/src/modules/resize2.js @@ -62,6 +62,7 @@ module.exports = { if (kMin === kMax) { return vMin; } + return Math.round((k - kMin) * vMax + (kMax - k) * vMin); }; @@ -244,6 +245,7 @@ module.exports = { Math.min(255, a0 * (t * t * t) + a1 * (t * t) + a2 * t + a3) ); }; + return this._interpolate2D(src, dst, options, interpolateCubic); }, @@ -258,6 +260,7 @@ module.exports = { Math.min(255, Math.round(((c3 * t + c2) * t + c1) * t + c0)) ); }; + return this._interpolate2D(src, dst, options, interpolateHermite); }, @@ -284,6 +287,7 @@ module.exports = { const c3 = x2 * t * t * t; return Math.max(0, Math.min(255, Math.round(c0 + c1 + c2 + c3))); }; + return this._interpolate2D(src, dst, options, interpolateBezier); } }; diff --git a/packages/plugin-resize/test/resize.test.js b/packages/plugin-resize/test/resize.test.js index a67440e6a..93f58706c 100644 --- a/packages/plugin-resize/test/resize.test.js +++ b/packages/plugin-resize/test/resize.test.js @@ -584,6 +584,7 @@ describe('Resize images', () => { for (let i = 0; i < imgsJimp.length; i++) { testImages[i].src = imgsJimp[i]; } + done(); }) .catch(done); diff --git a/packages/plugin-rotate/src/index.js b/packages/plugin-rotate/src/index.js index 6e566b24b..80570fdaf 100644 --- a/packages/plugin-rotate/src/index.js +++ b/packages/plugin-rotate/src/index.js @@ -97,6 +97,7 @@ function advancedRotate(deg, mode) { } } } + this.bitmap.data = dstBuffer; if (mode === true || typeof mode === 'string') { diff --git a/packages/test-utils/src/index.js b/packages/test-utils/src/index.js index d4a9bb192..534e9bb38 100644 --- a/packages/test-utils/src/index.js +++ b/packages/test-utils/src/index.js @@ -20,7 +20,7 @@ export function getTestDir(dir) { document && document.getElementsByTagName ) { - const scripts = document.getElementsByTagName('script'); + const scripts = document.querySelectorAll('script'); const testScript = [...scripts].find( script => script.src.match(testRE) && script.src.includes(dir) @@ -275,6 +275,7 @@ export function mkJGD(...args) { } } } + return jgd; } @@ -293,5 +294,6 @@ export function jgdToStr(jgd) { lines[y] += k; } } + return lines.map(l => "'" + l + "'").join('\n'); } diff --git a/packages/test-utils/src/jgd.js b/packages/test-utils/src/jgd.js index 93080c628..ed4bad605 100644 --- a/packages/test-utils/src/jgd.js +++ b/packages/test-utils/src/jgd.js @@ -45,6 +45,7 @@ function decode(jgd) { for (let i = 0; i < length; i++) { bitmap.data.writeUInt32BE(jgd.data[i], i * 4); } + return bitmap; } diff --git a/packages/type-jpeg/test/jpeg.test.js b/packages/type-jpeg/test/jpeg.test.js index ccec02520..480e8a1d4 100644 --- a/packages/type-jpeg/test/jpeg.test.js +++ b/packages/type-jpeg/test/jpeg.test.js @@ -1,5 +1,3 @@ -/* eslint-disable no-control-regex */ - import { Jimp, getTestDir } from '@jimp/test-utils'; import configure from '@jimp/custom'; diff --git a/packages/type-png/test/png.test.js b/packages/type-png/test/png.test.js index e2d162dc0..30a297d6e 100644 --- a/packages/type-png/test/png.test.js +++ b/packages/type-png/test/png.test.js @@ -1,5 +1,3 @@ -/* eslint-disable no-control-regex */ - import { Jimp, getTestDir } from '@jimp/test-utils'; import configure from '@jimp/custom'; diff --git a/packages/type-tiff/test/tiff.test.js b/packages/type-tiff/test/tiff.test.js index 4ff1685ec..84cb97201 100644 --- a/packages/type-tiff/test/tiff.test.js +++ b/packages/type-tiff/test/tiff.test.js @@ -1,5 +1,3 @@ -/* eslint-disable no-control-regex */ - import { Jimp, getTestDir } from '@jimp/test-utils'; import configure from '@jimp/custom'; diff --git a/packages/types/package.json b/packages/types/package.json index bae5f9ef6..cc2ff5423 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -29,7 +29,7 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@types/node": "^12.6.8" + "@types/node": "^12.7.5" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index d3a8a669a..b20cc51a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,10 +7,10 @@ resolved "https://registry.yarnpkg.com/@atomist/slack-messages/-/slack-messages-1.1.1.tgz#9de42932e89065fb4fe4842978ca2d1ed3424cea" integrity sha512-m2OzlTDbhvzK4hgswH9Lx0cdpq1AntXu53Klz5RGkFfuoDvKsnlU7tmtVfNWtUiP0zZbGtrb/BZYH7aB6TRnMA== -"@auto-it/core@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-7.4.1.tgz#0285bb262f392e26150bc192909b819f5a6dcbbc" - integrity sha512-w1sPik+C/9438dC2JQpblJ0oawlHAuI7ICV8QjUBe3q4ReuoTjpuvISVdRYDu1ohxXuHfz+WyH4idXv3NtdCCQ== +"@auto-it/core@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-7.6.0.tgz#5b155e5f09ba2e8a190a7569419a3e9ca7165415" + integrity sha512-mhkjcY41w1Jpi5HgdpDWBRbGOC2Jp4yqWRecdiT3LRP7/WTmoKyvEHU7n4goQ2cYjLyBTui0Zss5WjfsqNhxgA== dependencies: "@atomist/slack-messages" "~1.1.0" "@octokit/graphql" "^4.0.0" @@ -28,7 +28,7 @@ gitlog "^3.1.2" import-cwd "^3.0.0" lodash.chunk "^4.2.0" - node-fetch "2.5.0" + node-fetch "2.6.0" semver "^6.0.0" signale "^1.4.0" tapable "^2.0.0-beta.2" @@ -36,12 +36,12 @@ typescript-memoize "^1.0.0-alpha.3" url-join "^4.0.0" -"@auto-it/npm@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-7.4.1.tgz#7b61f383e259784162df2b74f890aa8191ebed37" - integrity sha512-KjFevSGxCt3eNPreOM0HBSTYxc9ylfhiYmoGVTab1x4/3Iw5+lVywPutZNtAZQwt4S9n7R5bpTlPqR/XcIofRw== +"@auto-it/npm@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-7.6.0.tgz#8f8cde72427e76885a626f3a07fc166a11ca57e1" + integrity sha512-XuYEti3DuZRHzZmnPt8y74QdW6VRpqw7bNoVY+J87EzqjUmIRaqNeY0hLuCZ2vKjDtk/bRUgENxLlA4mcst0mQ== dependencies: - "@auto-it/core" "^7.4.1" + "@auto-it/core" "^7.6.0" env-ci "^4.1.1" get-monorepo-packages "^1.1.0" parse-author "^2.0.0" @@ -52,257 +52,194 @@ url-join "^4.0.0" user-home "^2.0.0" -"@auto-it/released@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-7.4.1.tgz#ce9b1582947d2c53175636e26b3150725a9d641a" - integrity sha512-w4bXeboGLJSAP+Fu3EWMd6HPBico03Tr7RR24KwMe1cQJ7H0xv0EamD7Xr+wx+onHxV3x1v36xvpIuVIe9UWug== +"@auto-it/released@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-7.6.0.tgz#8a2db26691a7294ad887ec492c094c5d3e69f6fd" + integrity sha512-iLdd1XC7ZUyHRoKVqes7Ym6EXMrYKND8Dz/Btjufye+sYpkYJUj1Thahj4dT5BiWXkgH+ffu0qMJ2R7c7OuJXg== dependencies: - "@auto-it/core" "^7.4.1" + "@auto-it/core" "^7.6.0" deepmerge "^4.0.0" -"@babel/cli@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.1.0.tgz#a9429fd63911711b0fa93ae50d73beee6c42aef8" +"@babel/cli@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.0.tgz#1470a04394eaf37862989ea4912adf440fa6ff8d" + integrity sha512-1CTDyGUjQqW3Mz4gfKZ04KGOckyyaNmKneAMlABPS+ZyuxWv3FrVEVz7Ag08kNIztVx8VaJ8YgvYLSNlMKAT5Q== dependencies: commander "^2.8.1" convert-source-map "^1.1.0" fs-readdir-recursive "^1.1.0" glob "^7.0.0" - lodash "^4.17.10" + lodash "^4.17.13" mkdirp "^0.5.1" output-file-sync "^2.0.0" slash "^2.0.0" source-map "^0.5.0" optionalDependencies: - chokidar "^2.0.3" - -"@babel/code-frame@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz#bd71d9b192af978df915829d39d4094456439a0c" - dependencies: - "@babel/highlight" "7.0.0-beta.51" + chokidar "^2.1.8" -"@babel/code-frame@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.55.tgz#71f530e7b010af5eb7a7df7752f78921dd57e9ee" - dependencies: - "@babel/highlight" "7.0.0-beta.55" - -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d" + integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw== dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.0.0-beta.40": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.55.tgz#9e17c34b5ac855e427c98f570915a17fcc6bab4a" - dependencies: - "@babel/code-frame" "7.0.0-beta.55" - "@babel/generator" "7.0.0-beta.55" - "@babel/helpers" "7.0.0-beta.55" - "@babel/parser" "7.0.0-beta.55" - "@babel/template" "7.0.0-beta.55" - "@babel/traverse" "7.0.0-beta.55" - "@babel/types" "7.0.0-beta.55" - convert-source-map "^1.1.0" - debug "^3.1.0" - json5 "^0.5.0" - lodash "^4.17.10" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.0.tgz#08958f1371179f62df6966d8a614003d11faeb04" - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.0.0" - "@babel/helpers" "^7.1.0" - "@babel/parser" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" +"@babel/core@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48" + integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.6.0" + "@babel/helpers" "^7.6.0" + "@babel/parser" "^7.6.0" + "@babel/template" "^7.6.0" + "@babel/traverse" "^7.6.0" + "@babel/types" "^7.6.0" convert-source-map "^1.1.0" - debug "^3.1.0" - json5 "^0.5.0" - lodash "^4.17.10" + debug "^4.1.0" + json5 "^2.1.0" + lodash "^4.17.13" resolve "^1.3.2" semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.51.tgz#6c7575ffde761d07485e04baedc0392c6d9e30f6" - dependencies: - "@babel/types" "7.0.0-beta.51" - jsesc "^2.5.1" - lodash "^4.17.5" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/generator@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.55.tgz#8ec11152dcc398bae35dd181122704415c383a01" - dependencies: - "@babel/types" "7.0.0-beta.55" - jsesc "^2.5.1" - lodash "^4.17.10" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/generator@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa" +"@babel/generator@^7.4.0", "@babel/generator@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.0.tgz#e2c21efbfd3293ad819a2359b448f002bfdfda56" + integrity sha512-Ms8Mo7YBdMMn1BYuNtKuP/z0TgEIhbcyB8HVR6PPNYp4P61lMsABiS4A3VG1qznjXVCf3r+fVHhm4efTYVsySA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.6.0" jsesc "^2.5.1" - lodash "^4.17.10" + lodash "^4.17.13" source-map "^0.5.0" trim-right "^1.0.1" "@babel/helper-annotate-as-pure@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" + integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q== dependencies: "@babel/types" "^7.0.0" "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" + integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w== dependencies: "@babel/helper-explode-assignable-expression" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helper-call-delegate@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a" +"@babel/helper-call-delegate@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43" + integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ== dependencies: - "@babel/helper-hoist-variables" "^7.0.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-hoist-variables" "^7.4.4" + "@babel/traverse" "^7.4.4" + "@babel/types" "^7.4.4" -"@babel/helper-define-map@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c" +"@babel/helper-create-class-features-plugin@^7.5.5": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f" + integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng== dependencies: "@babel/helper-function-name" "^7.1.0" - "@babel/types" "^7.0.0" - lodash "^4.17.10" + "@babel/helper-member-expression-to-functions" "^7.5.5" + "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-replace-supers" "^7.5.5" + "@babel/helper-split-export-declaration" "^7.4.4" + +"@babel/helper-define-map@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" + integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== + dependencies: + "@babel/helper-function-name" "^7.1.0" + "@babel/types" "^7.5.5" + lodash "^4.17.13" "@babel/helper-explode-assignable-expression@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6" + integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA== dependencies: "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helper-function-name@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz#21b4874a227cf99ecafcc30a90302da5a2640561" - dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.51" - "@babel/template" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - -"@babel/helper-function-name@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.55.tgz#16aab21380a2eabcee3328d21b9586ba3427dbef" - dependencies: - "@babel/helper-get-function-arity" "7.0.0-beta.55" - "@babel/template" "7.0.0-beta.55" - "@babel/types" "7.0.0-beta.55" - -"@babel/helper-function-name@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz#a68cc8d04420ccc663dd258f9cc41b8261efa2d4" - dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.0.0" - "@babel/types" "^7.0.0" - "@babel/helper-function-name@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" + integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== dependencies: "@babel/helper-get-function-arity" "^7.0.0" "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helper-get-function-arity@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz#3281b2d045af95c172ce91b20825d85ea4676411" - dependencies: - "@babel/types" "7.0.0-beta.51" - -"@babel/helper-get-function-arity@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.55.tgz#8559ded96ecd3b626f9c1f57494edc4fa3cc6a94" - dependencies: - "@babel/types" "7.0.0-beta.55" - "@babel/helper-get-function-arity@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" + integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== dependencies: "@babel/types" "^7.0.0" -"@babel/helper-hoist-variables@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88" +"@babel/helper-hoist-variables@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" + integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.4.4" -"@babel/helper-member-expression-to-functions@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f" +"@babel/helper-member-expression-to-functions@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" + integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.5.5" "@babel/helper-module-imports@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" + integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A== dependencies: "@babel/types" "^7.0.0" -"@babel/helper-module-imports@^7.0.0-beta.40": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.55.tgz#93f927c6631d0689b8bbd1991d3fb2aa63eeb3f2" - dependencies: - "@babel/types" "7.0.0-beta.55" - lodash "^4.17.10" - -"@babel/helper-module-transforms@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.1.0.tgz#470d4f9676d9fad50b324cdcce5fbabbc3da5787" +"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a" + integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-simple-access" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" - lodash "^4.17.10" + "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/template" "^7.4.4" + "@babel/types" "^7.5.5" + lodash "^4.17.13" "@babel/helper-optimise-call-expression@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" + integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g== dependencies: "@babel/types" "^7.0.0" "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" + integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== -"@babel/helper-regex@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27" +"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351" + integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw== dependencies: - lodash "^4.17.10" + lodash "^4.17.13" "@babel/helper-remap-async-to-generator@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f" + integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-wrap-function" "^7.1.0" @@ -310,638 +247,671 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helper-replace-supers@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.1.0.tgz#5fc31de522ec0ef0899dc9b3e7cf6a5dd655f362" +"@babel/helper-replace-supers@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" + integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg== dependencies: - "@babel/helper-member-expression-to-functions" "^7.0.0" + "@babel/helper-member-expression-to-functions" "^7.5.5" "@babel/helper-optimise-call-expression" "^7.0.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/traverse" "^7.5.5" + "@babel/types" "^7.5.5" "@babel/helper-simple-access@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" + integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w== dependencies: "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" -"@babel/helper-split-export-declaration@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz#8a6c3f66c4d265352fc077484f9f6e80a51ab978" - dependencies: - "@babel/types" "7.0.0-beta.51" - -"@babel/helper-split-export-declaration@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.55.tgz#ecb8074bf2d22c6518a252282535def137a8704f" +"@babel/helper-split-export-declaration@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" + integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q== dependencies: - "@babel/types" "7.0.0-beta.55" - -"@babel/helper-split-export-declaration@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813" - dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.4.4" "@babel/helper-wrap-function@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.1.0.tgz#8cf54e9190706067f016af8f75cb3df829cc8c66" + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" + integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== dependencies: "@babel/helper-function-name" "^7.1.0" "@babel/template" "^7.1.0" "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helpers@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-beta.55.tgz#d0b4b9a327dba42d58890011deb905c820739617" - dependencies: - "@babel/template" "7.0.0-beta.55" - "@babel/traverse" "7.0.0-beta.55" - "@babel/types" "7.0.0-beta.55" + "@babel/types" "^7.2.0" -"@babel/helpers@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.1.0.tgz#429bf0f0020be56a4242883432084e3d70a8a141" +"@babel/helpers@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.0.tgz#21961d16c6a3c3ab597325c34c465c0887d31c6e" + integrity sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ== dependencies: - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/highlight@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.51.tgz#e8844ae25a1595ccfd42b89623b4376ca06d225d" - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^3.0.0" - -"@babel/highlight@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.55.tgz#988653647d629c261dae156e74d5f0252ba520c0" - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^3.0.0" + "@babel/template" "^7.6.0" + "@babel/traverse" "^7.6.0" + "@babel/types" "^7.6.0" "@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540" + integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ== dependencies: chalk "^2.0.0" esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.51.tgz#27cec2df409df60af58270ed8f6aa55409ea86f6" - -"@babel/parser@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-beta.55.tgz#0a527efc148c6c8cd85d5ffddacad817a2daeeb2" +"@babel/parser@^7.0.0", "@babel/parser@^7.4.3", "@babel/parser@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b" + integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ== -"@babel/parser@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0.tgz#697655183394facffb063437ddf52c0277698775" - -"@babel/parser@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e" - -"@babel/plugin-proposal-async-generator-functions@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.1.0.tgz#41c1a702e10081456e23a7b74d891922dd1bb6ce" +"@babel/plugin-proposal-async-generator-functions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" + integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-remap-async-to-generator" "^7.1.0" - "@babel/plugin-syntax-async-generators" "^7.0.0" + "@babel/plugin-syntax-async-generators" "^7.2.0" -"@babel/plugin-proposal-class-properties@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.1.0.tgz#9af01856b1241db60ec8838d84691aa0bd1e8df4" +"@babel/plugin-proposal-class-properties@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" + integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-member-expression-to-functions" "^7.0.0" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-create-class-features-plugin" "^7.5.5" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.1.0" - "@babel/plugin-syntax-class-properties" "^7.0.0" -"@babel/plugin-proposal-json-strings@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz#3b4d7b5cf51e1f2e70f52351d28d44fc2970d01e" +"@babel/plugin-proposal-dynamic-import@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506" + integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-json-strings" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" -"@babel/plugin-proposal-object-rest-spread@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz#9a17b547f64d0676b6c9cecd4edf74a82ab85e7e" +"@babel/plugin-proposal-json-strings@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317" + integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" + "@babel/plugin-syntax-json-strings" "^7.2.0" -"@babel/plugin-proposal-optional-catch-binding@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz#b610d928fe551ff7117d42c8bb410eec312a6425" +"@babel/plugin-proposal-object-rest-spread@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58" + integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.0.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" -"@babel/plugin-proposal-unicode-property-regex@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz#498b39cd72536cd7c4b26177d030226eba08cd33" +"@babel/plugin-proposal-optional-catch-binding@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5" + integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.0.0" - regexpu-core "^4.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" -"@babel/plugin-syntax-async-generators@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz#bf0891dcdbf59558359d0c626fdc9490e20bc13c" +"@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78" + integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.5.4" -"@babel/plugin-syntax-class-properties@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.0.0.tgz#e051af5d300cbfbcec4a7476e37a803489881634" +"@babel/plugin-syntax-async-generators@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f" + integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-json-strings@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz#0d259a68090e15b383ce3710e01d5b23f3770cbd" +"@babel/plugin-syntax-dynamic-import@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" + integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-object-rest-spread@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz#37d8fbcaf216bd658ea1aebbeb8b75e88ebc549b" +"@babel/plugin-syntax-json-strings@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470" + integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-optional-catch-binding@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz#886f72008b3a8b185977f7cb70713b45e51ee475" +"@babel/plugin-syntax-object-rest-spread@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" + integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-arrow-functions@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz#a6c14875848c68a3b4b3163a486535ef25c7e749" +"@babel/plugin-syntax-optional-catch-binding@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c" + integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-async-to-generator@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.1.0.tgz#109e036496c51dd65857e16acab3bafdf3c57811" +"@babel/plugin-transform-arrow-functions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" + integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-async-to-generator@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" + integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-remap-async-to-generator" "^7.1.0" -"@babel/plugin-transform-block-scoped-functions@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz#482b3f75103927e37288b3b67b65f848e2aa0d07" +"@babel/plugin-transform-block-scoped-functions@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190" + integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz#1745075edffd7cdaf69fab2fb6f9694424b7e9bc" +"@babel/plugin-transform-block-scoping@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz#c49e21228c4bbd4068a35667e6d951c75439b1dc" + integrity sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - lodash "^4.17.10" + lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.1.0.tgz#ab3f8a564361800cbc8ab1ca6f21108038432249" +"@babel/plugin-transform-classes@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" + integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-define-map" "^7.1.0" + "@babel/helper-define-map" "^7.5.5" "@babel/helper-function-name" "^7.1.0" "@babel/helper-optimise-call-expression" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" + "@babel/helper-replace-supers" "^7.5.5" + "@babel/helper-split-export-declaration" "^7.4.4" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz#2fbb8900cd3e8258f2a2ede909b90e7556185e31" +"@babel/plugin-transform-computed-properties@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da" + integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz#68e911e1935dda2f06b6ccbbf184ffb024e9d43a" +"@babel/plugin-transform-destructuring@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6" + integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-dotall-regex@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz#73a24da69bc3c370251f43a3d048198546115e58" +"@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3" + integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.0.0" - regexpu-core "^4.1.3" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.5.4" -"@babel/plugin-transform-duplicate-keys@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz#a0601e580991e7cace080e4cf919cfd58da74e86" +"@babel/plugin-transform-duplicate-keys@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" + integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-exponentiation-operator@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.1.0.tgz#9c34c2ee7fd77e02779cfa37e403a2e1003ccc73" +"@babel/plugin-transform-exponentiation-operator@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008" + integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A== dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-for-of@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz#f2ba4eadb83bd17dc3c7e9b30f4707365e1c3e39" +"@babel/plugin-transform-for-of@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556" + integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.1.0.tgz#29c5550d5c46208e7f730516d41eeddd4affadbb" +"@babel/plugin-transform-function-name@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad" + integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA== dependencies: "@babel/helper-function-name" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-literals@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz#2aec1d29cdd24c407359c930cdd89e914ee8ff86" +"@babel/plugin-transform-literals@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1" + integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-modules-amd@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.1.0.tgz#f9e0a7072c12e296079b5a59f408ff5b97bf86a8" +"@babel/plugin-transform-member-expression-literals@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d" + integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA== dependencies: - "@babel/helper-module-transforms" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-modules-commonjs@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.1.0.tgz#0a9d86451cbbfb29bd15186306897c67f6f9a05c" +"@babel/plugin-transform-modules-amd@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91" + integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg== dependencies: "@babel/helper-module-transforms" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" + babel-plugin-dynamic-import-node "^2.3.0" + +"@babel/plugin-transform-modules-commonjs@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" + integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== + dependencies: + "@babel/helper-module-transforms" "^7.4.4" + "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-simple-access" "^7.1.0" + babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz#8873d876d4fee23209decc4d1feab8f198cf2df4" +"@babel/plugin-transform-modules-systemjs@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" + integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== dependencies: - "@babel/helper-hoist-variables" "^7.0.0" + "@babel/helper-hoist-variables" "^7.4.4" "@babel/helper-plugin-utils" "^7.0.0" + babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-umd@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.1.0.tgz#a29a7d85d6f28c3561c33964442257cc6a21f2a8" +"@babel/plugin-transform-modules-umd@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae" + integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== dependencies: "@babel/helper-module-transforms" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-new-target@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a" +"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz#1e6e663097813bb4f53d42df0750cf28ad3bb3f1" + integrity sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew== + dependencies: + regexp-tree "^0.1.13" + +"@babel/plugin-transform-new-target@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5" + integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-object-super@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.1.0.tgz#b1ae194a054b826d8d4ba7ca91486d4ada0f91bb" +"@babel/plugin-transform-object-super@^7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9" + integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.1.0" + "@babel/helper-replace-supers" "^7.5.5" -"@babel/plugin-transform-parameters@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.1.0.tgz#44f492f9d618c9124026e62301c296bf606a7aed" +"@babel/plugin-transform-parameters@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16" + integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw== dependencies: - "@babel/helper-call-delegate" "^7.1.0" + "@babel/helper-call-delegate" "^7.4.4" "@babel/helper-get-function-arity" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-regenerator@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1" +"@babel/plugin-transform-property-literals@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905" + integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ== dependencies: - regenerator-transform "^0.13.3" + "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-shorthand-properties@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15" +"@babel/plugin-transform-regenerator@^7.4.5": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f" + integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA== + dependencies: + regenerator-transform "^0.14.0" + +"@babel/plugin-transform-reserved-words@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634" + integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-spread@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz#93583ce48dd8c85e53f3a46056c856e4af30b49b" +"@babel/plugin-transform-shorthand-properties@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" + integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-sticky-regex@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz#30a9d64ac2ab46eec087b8530535becd90e73366" +"@babel/plugin-transform-spread@^7.2.0": + version "7.2.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406" + integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-transform-sticky-regex@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1" + integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-regex" "^7.0.0" -"@babel/plugin-transform-template-literals@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz#084f1952efe5b153ddae69eb8945f882c7a97c65" +"@babel/plugin-transform-template-literals@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0" + integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typeof-symbol@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz#4dcf1e52e943e5267b7313bff347fdbe0f81cec9" +"@babel/plugin-transform-typeof-symbol@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2" + integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-unicode-regex@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz#c6780e5b1863a76fe792d90eded9fcd5b51d68fc" +"@babel/plugin-transform-unicode-regex@^7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f" + integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.0.0" - regexpu-core "^4.1.3" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.5.4" -"@babel/preset-env@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11" +"@babel/preset-env@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50" + integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-async-generator-functions" "^7.1.0" - "@babel/plugin-proposal-json-strings" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.0.0" - "@babel/plugin-syntax-async-generators" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.0.0" - "@babel/plugin-transform-arrow-functions" "^7.0.0" - "@babel/plugin-transform-async-to-generator" "^7.1.0" - "@babel/plugin-transform-block-scoped-functions" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" - "@babel/plugin-transform-classes" "^7.1.0" - "@babel/plugin-transform-computed-properties" "^7.0.0" - "@babel/plugin-transform-destructuring" "^7.0.0" - "@babel/plugin-transform-dotall-regex" "^7.0.0" - "@babel/plugin-transform-duplicate-keys" "^7.0.0" - "@babel/plugin-transform-exponentiation-operator" "^7.1.0" - "@babel/plugin-transform-for-of" "^7.0.0" - "@babel/plugin-transform-function-name" "^7.1.0" - "@babel/plugin-transform-literals" "^7.0.0" - "@babel/plugin-transform-modules-amd" "^7.1.0" - "@babel/plugin-transform-modules-commonjs" "^7.1.0" - "@babel/plugin-transform-modules-systemjs" "^7.0.0" - "@babel/plugin-transform-modules-umd" "^7.1.0" - "@babel/plugin-transform-new-target" "^7.0.0" - "@babel/plugin-transform-object-super" "^7.1.0" - "@babel/plugin-transform-parameters" "^7.1.0" - "@babel/plugin-transform-regenerator" "^7.0.0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0" - "@babel/plugin-transform-spread" "^7.0.0" - "@babel/plugin-transform-sticky-regex" "^7.0.0" - "@babel/plugin-transform-template-literals" "^7.0.0" - "@babel/plugin-transform-typeof-symbol" "^7.0.0" - "@babel/plugin-transform-unicode-regex" "^7.0.0" - browserslist "^4.1.0" + "@babel/plugin-proposal-async-generator-functions" "^7.2.0" + "@babel/plugin-proposal-dynamic-import" "^7.5.0" + "@babel/plugin-proposal-json-strings" "^7.2.0" + "@babel/plugin-proposal-object-rest-spread" "^7.5.5" + "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" + "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" + "@babel/plugin-syntax-json-strings" "^7.2.0" + "@babel/plugin-syntax-object-rest-spread" "^7.2.0" + "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + "@babel/plugin-transform-arrow-functions" "^7.2.0" + "@babel/plugin-transform-async-to-generator" "^7.5.0" + "@babel/plugin-transform-block-scoped-functions" "^7.2.0" + "@babel/plugin-transform-block-scoping" "^7.6.0" + "@babel/plugin-transform-classes" "^7.5.5" + "@babel/plugin-transform-computed-properties" "^7.2.0" + "@babel/plugin-transform-destructuring" "^7.6.0" + "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/plugin-transform-duplicate-keys" "^7.5.0" + "@babel/plugin-transform-exponentiation-operator" "^7.2.0" + "@babel/plugin-transform-for-of" "^7.4.4" + "@babel/plugin-transform-function-name" "^7.4.4" + "@babel/plugin-transform-literals" "^7.2.0" + "@babel/plugin-transform-member-expression-literals" "^7.2.0" + "@babel/plugin-transform-modules-amd" "^7.5.0" + "@babel/plugin-transform-modules-commonjs" "^7.6.0" + "@babel/plugin-transform-modules-systemjs" "^7.5.0" + "@babel/plugin-transform-modules-umd" "^7.2.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0" + "@babel/plugin-transform-new-target" "^7.4.4" + "@babel/plugin-transform-object-super" "^7.5.5" + "@babel/plugin-transform-parameters" "^7.4.4" + "@babel/plugin-transform-property-literals" "^7.2.0" + "@babel/plugin-transform-regenerator" "^7.4.5" + "@babel/plugin-transform-reserved-words" "^7.2.0" + "@babel/plugin-transform-shorthand-properties" "^7.2.0" + "@babel/plugin-transform-spread" "^7.2.0" + "@babel/plugin-transform-sticky-regex" "^7.2.0" + "@babel/plugin-transform-template-literals" "^7.4.4" + "@babel/plugin-transform-typeof-symbol" "^7.2.0" + "@babel/plugin-transform-unicode-regex" "^7.4.4" + "@babel/types" "^7.6.0" + browserslist "^4.6.0" + core-js-compat "^3.1.1" invariant "^2.2.2" js-levenshtein "^1.1.3" - semver "^5.3.0" + semver "^5.5.0" -"@babel/register@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.0.0.tgz#fa634bae1bfa429f60615b754fc1f1d745edd827" +"@babel/register@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.0.tgz#76b6f466714680f4becafd45beeb2a7b87431abf" + integrity sha512-78BomdN8el+x/nkup9KwtjJXuptW5oXMFmP11WoM2VJBjxrKv4grC3qjpLL8RGGUYUGsm57xnjYFM2uom+jWUQ== dependencies: - core-js "^2.5.7" - find-cache-dir "^1.0.0" - home-or-tmp "^3.0.0" - lodash "^4.17.10" + find-cache-dir "^2.0.0" + lodash "^4.17.13" mkdirp "^0.5.1" pirates "^4.0.0" source-map-support "^0.5.9" -"@babel/template@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.51.tgz#9602a40aebcf357ae9677e2532ef5fc810f5fbff" - dependencies: - "@babel/code-frame" "7.0.0-beta.51" - "@babel/parser" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - lodash "^4.17.5" - -"@babel/template@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.55.tgz#c6cab0e2722ba5e33fe034073b6d31673aba326e" - dependencies: - "@babel/code-frame" "7.0.0-beta.55" - "@babel/parser" "7.0.0-beta.55" - "@babel/types" "7.0.0-beta.55" - lodash "^4.17.10" - -"@babel/template@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80" +"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6" + integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.6.0" + "@babel/types" "^7.6.0" -"@babel/template@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.0.tgz#58cc9572e1bfe24fe1537fdf99d839d53e517e22" +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.0.tgz#389391d510f79be7ce2ddd6717be66d3fed4b516" + integrity sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/traverse@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.51.tgz#981daf2cec347a6231d3aa1d9e1803b03aaaa4a8" - dependencies: - "@babel/code-frame" "7.0.0-beta.51" - "@babel/generator" "7.0.0-beta.51" - "@babel/helper-function-name" "7.0.0-beta.51" - "@babel/helper-split-export-declaration" "7.0.0-beta.51" - "@babel/parser" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - debug "^3.1.0" - globals "^11.1.0" - invariant "^2.2.0" - lodash "^4.17.5" - -"@babel/traverse@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.55.tgz#50be5d0fcc5cc4ac020a7b0c519be8dae345d4be" - dependencies: - "@babel/code-frame" "7.0.0-beta.55" - "@babel/generator" "7.0.0-beta.55" - "@babel/helper-function-name" "7.0.0-beta.55" - "@babel/helper-split-export-declaration" "7.0.0-beta.55" - "@babel/parser" "7.0.0-beta.55" - "@babel/types" "7.0.0-beta.55" - debug "^3.1.0" + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.6.0" + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/parser" "^7.6.0" + "@babel/types" "^7.6.0" + debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.10" + lodash "^4.17.13" -"@babel/traverse@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0.tgz#b1fe9b6567fdf3ab542cfad6f3b31f854d799a61" +"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0": + version "7.6.1" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648" + integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.0.0" - "@babel/helper-function-name" "^7.0.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/types" "^7.0.0" - debug "^3.1.0" - globals "^11.1.0" - lodash "^4.17.10" + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" -"@babel/traverse@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2" +"@evocateur/libnpmaccess@^3.1.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845" + integrity sha512-KSCAHwNWro0CF2ukxufCitT9K5LjL/KuMmNzSu8wuwN2rjyKHD8+cmOsiybK+W5hdnwc5M1SmRlVCaMHQo+3rg== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.0.0" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - debug "^3.1.0" - globals "^11.1.0" - lodash "^4.17.10" + "@evocateur/npm-registry-fetch" "^4.0.0" + aproba "^2.0.0" + figgy-pudding "^3.5.1" + get-stream "^4.0.0" + npm-package-arg "^6.1.0" -"@babel/types@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.51.tgz#d802b7b543b5836c778aa691797abf00f3d97ea9" +"@evocateur/libnpmpublish@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@evocateur/libnpmpublish/-/libnpmpublish-1.2.2.tgz#55df09d2dca136afba9c88c759ca272198db9f1a" + integrity sha512-MJrrk9ct1FeY9zRlyeoyMieBjGDG9ihyyD9/Ft6MMrTxql9NyoEx2hw9casTIP4CdqEVu+3nQ2nXxoJ8RCXyFg== dependencies: - esutils "^2.0.2" - lodash "^4.17.5" - to-fast-properties "^2.0.0" + "@evocateur/npm-registry-fetch" "^4.0.0" + aproba "^2.0.0" + figgy-pudding "^3.5.1" + get-stream "^4.0.0" + lodash.clonedeep "^4.5.0" + normalize-package-data "^2.4.0" + npm-package-arg "^6.1.0" + semver "^5.5.1" + ssri "^6.0.1" -"@babel/types@7.0.0-beta.55": - version "7.0.0-beta.55" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.55.tgz#7755c9d2e58315a64f05d8cf3322379be16d9199" +"@evocateur/npm-registry-fetch@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@evocateur/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz#8c4c38766d8d32d3200fcb0a83f064b57365ed66" + integrity sha512-k1WGfKRQyhJpIr+P17O5vLIo2ko1PFLKwoetatdduUSt/aQ4J2sJrJwwatdI5Z3SiYk/mRH9S3JpdmMFd/IK4g== dependencies: - esutils "^2.0.2" - lodash "^4.17.10" - to-fast-properties "^2.0.0" + JSONStream "^1.3.4" + bluebird "^3.5.1" + figgy-pudding "^3.4.1" + lru-cache "^5.1.1" + make-fetch-happen "^5.0.0" + npm-package-arg "^6.1.0" + safe-buffer "^5.1.2" -"@babel/types@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118" +"@evocateur/pacote@^9.6.3": + version "9.6.5" + resolved "https://registry.yarnpkg.com/@evocateur/pacote/-/pacote-9.6.5.tgz#33de32ba210b6f17c20ebab4d497efc6755f4ae5" + integrity sha512-EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w== dependencies: - esutils "^2.0.2" - lodash "^4.17.10" - to-fast-properties "^2.0.0" + "@evocateur/npm-registry-fetch" "^4.0.0" + bluebird "^3.5.3" + cacache "^12.0.3" + chownr "^1.1.2" + figgy-pudding "^3.5.1" + get-stream "^4.1.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^5.1.1" + make-fetch-happen "^5.0.0" + minimatch "^3.0.4" + minipass "^2.3.5" + mississippi "^3.0.0" + mkdirp "^0.5.1" + normalize-package-data "^2.5.0" + npm-package-arg "^6.1.0" + npm-packlist "^1.4.4" + npm-pick-manifest "^3.0.0" + osenv "^0.1.5" + promise-inflight "^1.0.1" + promise-retry "^1.1.1" + protoduck "^5.0.1" + rimraf "^2.6.3" + safe-buffer "^5.2.0" + semver "^5.7.0" + ssri "^6.0.1" + tar "^4.4.10" + unique-filename "^1.1.1" + which "^1.3.1" -"@lerna/add@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.13.3.tgz#f4c1674839780e458f0426d4f7b6d0a77b9a2ae9" - integrity sha512-T3/Lsbo9ZFq+vL3ssaHxA8oKikZAPTJTGFe4CRuQgWCDd/M61+51jeWsngdaHpwzSSRDRjxg8fJTG10y10pnfA== +"@lerna/add@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.16.2.tgz#90ecc1be7051cfcec75496ce122f656295bd6e94" + integrity sha512-RAAaF8aODPogj2Ge9Wj3uxPFIBGpog9M+HwSuq03ZnkkO831AmasCTJDqV+GEpl1U2DvnhZQEwHpWmTT0uUeEw== dependencies: - "@lerna/bootstrap" "3.13.3" - "@lerna/command" "3.13.3" - "@lerna/filter-options" "3.13.3" - "@lerna/npm-conf" "3.13.0" + "@evocateur/pacote" "^9.6.3" + "@lerna/bootstrap" "3.16.2" + "@lerna/command" "3.16.0" + "@lerna/filter-options" "3.16.0" + "@lerna/npm-conf" "3.16.0" "@lerna/validation-error" "3.13.0" dedent "^0.7.0" npm-package-arg "^6.1.0" - p-map "^1.2.0" - pacote "^9.5.0" - semver "^5.5.0" + p-map "^2.1.0" + semver "^6.2.0" -"@lerna/batch-packages@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.13.0.tgz#697fde5be28822af9d9dca2f750250b90a89a000" - integrity sha512-TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw== +"@lerna/batch-packages@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/batch-packages/-/batch-packages-3.16.0.tgz#1c16cb697e7d718177db744cbcbdac4e30253c8c" + integrity sha512-7AdMkANpubY/FKFI01im01tlx6ygOBJ/0JcixMUWoWP/7Ds3SWQF22ID6fbBr38jUWptYLDs2fagtTDL7YUPuA== dependencies: - "@lerna/package-graph" "3.13.0" - "@lerna/validation-error" "3.13.0" + "@lerna/package-graph" "3.16.0" npmlog "^4.1.2" -"@lerna/bootstrap@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.13.3.tgz#a0e5e466de5c100b49d558d39139204fc4db5c95" - integrity sha512-2XzijnLHRZOVQh8pwS7+5GR3cG4uh+EiLrWOishCq2TVzkqgjaS3GGBoef7KMCXfWHoLqAZRr/jEdLqfETLVqg== - dependencies: - "@lerna/batch-packages" "3.13.0" - "@lerna/command" "3.13.3" - "@lerna/filter-options" "3.13.3" - "@lerna/has-npm-version" "3.13.3" - "@lerna/npm-install" "3.13.3" - "@lerna/package-graph" "3.13.0" +"@lerna/bootstrap@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-3.16.2.tgz#be268d940221d3c3270656b9b791b492559ad9d8" + integrity sha512-I+gs7eh6rv9Vyd+CwqL7sftRfOOsSzCle8cv/CGlMN7/p7EAVhxEdAw8SYoHIKHzipXszuqqy1Y3opyleD0qdA== + dependencies: + "@lerna/batch-packages" "3.16.0" + "@lerna/command" "3.16.0" + "@lerna/filter-options" "3.16.0" + "@lerna/has-npm-version" "3.16.0" + "@lerna/npm-install" "3.16.0" + "@lerna/package-graph" "3.16.0" "@lerna/pulse-till-done" "3.13.0" - "@lerna/rimraf-dir" "3.13.3" - "@lerna/run-lifecycle" "3.13.0" - "@lerna/run-parallel-batches" "3.13.0" - "@lerna/symlink-binary" "3.13.0" - "@lerna/symlink-dependencies" "3.13.0" + "@lerna/rimraf-dir" "3.14.2" + "@lerna/run-lifecycle" "3.16.2" + "@lerna/run-parallel-batches" "3.16.0" + "@lerna/symlink-binary" "3.16.2" + "@lerna/symlink-dependencies" "3.16.2" "@lerna/validation-error" "3.13.0" dedent "^0.7.0" - get-port "^3.2.0" - multimatch "^2.1.0" + get-port "^4.2.0" + multimatch "^3.0.0" npm-package-arg "^6.1.0" npmlog "^4.1.2" p-finally "^1.0.0" - p-map "^1.2.0" + p-map "^2.1.0" p-map-series "^1.0.0" p-waterfall "^1.0.0" read-package-tree "^5.1.6" - semver "^5.5.0" + semver "^6.2.0" -"@lerna/changed@3.13.4": - version "3.13.4" - resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.13.4.tgz#c69d8a079999e49611dd58987f08437baee81ad4" - integrity sha512-9lfOyRVObasw6L/z7yCSfsEl1QKy0Eamb8t2Krg1deIoAt+cE3JXOdGGC1MhOSli+7f/U9LyLXjJzIOs/pc9fw== +"@lerna/changed@3.16.4": + version "3.16.4" + resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.16.4.tgz#c3e727d01453513140eee32c94b695de577dc955" + integrity sha512-NCD7XkK744T23iW0wqKEgF4R9MYmReUbyHCZKopFnsNpQdqumc3SOIvQUAkKCP6hQJmYvxvOieoVgy/CVDpZ5g== dependencies: - "@lerna/collect-updates" "3.13.3" - "@lerna/command" "3.13.3" - "@lerna/listable" "3.13.0" + "@lerna/collect-updates" "3.16.0" + "@lerna/command" "3.16.0" + "@lerna/listable" "3.16.0" "@lerna/output" "3.13.0" - "@lerna/version" "3.13.4" + "@lerna/version" "3.16.4" -"@lerna/check-working-tree@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.13.3.tgz#836a3ffd4413a29aca92ccca4a115e4f97109992" - integrity sha512-LoGZvTkne+V1WpVdCTU0XNzFKsQa2AiAFKksGRT0v8NQj6VAPp0jfVYDayTqwaWt2Ne0OGKOFE79Y5LStOuhaQ== +"@lerna/check-working-tree@3.14.2": + version "3.14.2" + resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-3.14.2.tgz#5ce007722180a69643a8456766ed8a91fc7e9ae1" + integrity sha512-7safqxM/MYoAoxZxulUDtIJIbnBIgo0PB/FHytueG+9VaX7GMnDte2Bt1EKa0dz2sAyQdmQ3Q8ZXpf/6JDjaeg== dependencies: - "@lerna/describe-ref" "3.13.3" + "@lerna/collect-uncommitted" "3.14.2" + "@lerna/describe-ref" "3.14.2" "@lerna/validation-error" "3.13.0" -"@lerna/child-process@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.13.3.tgz#6c084ee5cca9fc9e04d6bf4fc3f743ed26ff190c" - integrity sha512-3/e2uCLnbU+bydDnDwyadpOmuzazS01EcnOleAnuj9235CU2U97DH6OyoG1EW/fU59x11J+HjIqovh5vBaMQjQ== +"@lerna/child-process@3.14.2": + version "3.14.2" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-3.14.2.tgz#950240cba83f7dfe25247cfa6c9cebf30b7d94f6" + integrity sha512-xnq+W5yQb6RkwI0p16ZQnrn6HkloH/MWTw4lGE1nKsBLAUbmSU5oTE93W1nrG0X3IMF/xWc9UYvNdUGMWvZZ4w== dependencies: chalk "^2.3.1" execa "^1.0.0" strong-log-transformer "^2.0.0" -"@lerna/clean@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.13.3.tgz#5673a1238e0712d31711e7e4e8cb9641891daaea" - integrity sha512-xmNauF1PpmDaKdtA2yuRc23Tru4q7UMO6yB1a/TTwxYPYYsAWG/CBK65bV26J7x4RlZtEv06ztYGMa9zh34UXA== +"@lerna/clean@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-3.16.0.tgz#1c134334cacea1b1dbeacdc580e8b9240db8efa1" + integrity sha512-5P9U5Y19WmYZr7UAMGXBpY7xCRdlR7zhHy8MAPDKVx70rFIBS6nWXn5n7Kntv74g7Lm1gJ2rsiH5tj1OPcRJgg== dependencies: - "@lerna/command" "3.13.3" - "@lerna/filter-options" "3.13.3" + "@lerna/command" "3.16.0" + "@lerna/filter-options" "3.16.0" "@lerna/prompt" "3.13.0" "@lerna/pulse-till-done" "3.13.0" - "@lerna/rimraf-dir" "3.13.3" - p-map "^1.2.0" + "@lerna/rimraf-dir" "3.14.2" + p-map "^2.1.0" p-map-series "^1.0.0" p-waterfall "^1.0.0" @@ -955,128 +925,139 @@ npmlog "^4.1.2" yargs "^12.0.1" -"@lerna/collect-updates@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.13.3.tgz#616648da59f0aff4a8e60257795cc46ca6921edd" - integrity sha512-sTpALOAxli/ZS+Mjq6fbmjU9YXqFJ2E4FrE1Ijl4wPC5stXEosg2u0Z1uPY+zVKdM+mOIhLxPVdx83rUgRS+Cg== +"@lerna/collect-uncommitted@3.14.2": + version "3.14.2" + resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-3.14.2.tgz#b5ed00d800bea26bb0d18404432b051eee8d030e" + integrity sha512-4EkQu4jIOdNL2BMzy/N0ydHB8+Z6syu6xiiKXOoFl0WoWU9H1jEJCX4TH7CmVxXL1+jcs8FIS2pfQz4oew99Eg== + dependencies: + "@lerna/child-process" "3.14.2" + chalk "^2.3.1" + figgy-pudding "^3.5.1" + npmlog "^4.1.2" + +"@lerna/collect-updates@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-3.16.0.tgz#6db3ce8a740a4e2b972c033a63bdfb77f2553d8c" + integrity sha512-HwAIl815X2TNlmcp28zCrSdXfoZWNP7GJPEqNWYk7xDJTYLqQ+SrmKUePjb3AMGBwYAraZSEJLbHdBpJ5+cHmQ== dependencies: - "@lerna/child-process" "3.13.3" - "@lerna/describe-ref" "3.13.3" + "@lerna/child-process" "3.14.2" + "@lerna/describe-ref" "3.14.2" minimatch "^3.0.4" npmlog "^4.1.2" - slash "^1.0.0" + slash "^2.0.0" -"@lerna/command@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.13.3.tgz#5b20b3f507224573551039e0460bc36c39f7e9d1" - integrity sha512-WHFIQCubJV0T8gSLRNr6exZUxTswrh+iAtJCb86SE0Sa+auMPklE8af7w2Yck5GJfewmxSjke3yrjNxQrstx7w== +"@lerna/command@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/command/-/command-3.16.0.tgz#ba3dba49cb5ce4d11b48269cf95becd86e30773f" + integrity sha512-u7tE4GC4/gfbPA9eQg+0ulnoJ+PMoMqomx033r/IxqZrHtmJR9+pF/37S0fsxJ2hX/RMFPC7c9Q/i8NEufSpdQ== dependencies: - "@lerna/child-process" "3.13.3" - "@lerna/package-graph" "3.13.0" - "@lerna/project" "3.13.1" + "@lerna/child-process" "3.14.2" + "@lerna/package-graph" "3.16.0" + "@lerna/project" "3.16.0" "@lerna/validation-error" "3.13.0" "@lerna/write-log-file" "3.13.0" dedent "^0.7.0" execa "^1.0.0" - is-ci "^1.0.10" - lodash "^4.17.5" + is-ci "^2.0.0" + lodash "^4.17.14" npmlog "^4.1.2" -"@lerna/conventional-commits@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.13.0.tgz#877aa225ca34cca61c31ea02a5a6296af74e1144" - integrity sha512-BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA== +"@lerna/conventional-commits@3.16.4": + version "3.16.4" + resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-3.16.4.tgz#bf464f11b2f6534dad204db00430e1651b346a04" + integrity sha512-QSZJ0bC9n6FVaf+7KDIq5zMv8WnHXnwhyL5jG1Nyh3SgOg9q2uflqh7YsYB+G6FwaRfnPaKosh6obijpYg0llA== dependencies: "@lerna/validation-error" "3.13.0" conventional-changelog-angular "^5.0.3" conventional-changelog-core "^3.1.6" - conventional-recommended-bump "^4.0.4" - fs-extra "^7.0.0" + conventional-recommended-bump "^5.0.0" + fs-extra "^8.1.0" get-stream "^4.0.0" + lodash.template "^4.5.0" npm-package-arg "^6.1.0" npmlog "^4.1.2" - pify "^3.0.0" - semver "^5.5.0" + pify "^4.0.1" + semver "^6.2.0" -"@lerna/create-symlink@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.13.0.tgz#e01133082fe040779712c960683cb3a272b67809" - integrity sha512-PTvg3jAAJSAtLFoZDsuTMv1wTOC3XYIdtg54k7uxIHsP8Ztpt+vlilY/Cni0THAqEMHvfiToel76Xdta4TU21Q== +"@lerna/create-symlink@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-3.16.2.tgz#412cb8e59a72f5a7d9463e4e4721ad2070149967" + integrity sha512-pzXIJp6av15P325sgiIRpsPXLFmkisLhMBCy4764d+7yjf2bzrJ4gkWVMhsv4AdF0NN3OyZ5jjzzTtLNqfR+Jw== dependencies: - cmd-shim "^2.0.2" - fs-extra "^7.0.0" + "@zkochan/cmd-shim" "^3.1.0" + fs-extra "^8.1.0" npmlog "^4.1.2" -"@lerna/create@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.13.3.tgz#6ded142c54b7f3cea86413c3637b067027b7f55d" - integrity sha512-4M5xT1AyUMwt1gCDph4BfW3e6fZmt0KjTa3FoXkUotf/w/eqTsc2IQ+ULz2+gOFQmtuNbqIZEOK3J4P9ArJJ/A== +"@lerna/create@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-3.16.0.tgz#4de841ec7d98b29bb19fb7d6ad982e65f7a150e8" + integrity sha512-OZApR1Iz7awutbmj4sAArwhqCyKgcrnw9rH0aWAUrkYWrD1w4TwkvAcYAsfx5GpQGbLQwoXhoyyPwPfZRRWz3Q== dependencies: - "@lerna/child-process" "3.13.3" - "@lerna/command" "3.13.3" - "@lerna/npm-conf" "3.13.0" + "@evocateur/pacote" "^9.6.3" + "@lerna/child-process" "3.14.2" + "@lerna/command" "3.16.0" + "@lerna/npm-conf" "3.16.0" "@lerna/validation-error" "3.13.0" camelcase "^5.0.0" dedent "^0.7.0" - fs-extra "^7.0.0" - globby "^8.0.1" + fs-extra "^8.1.0" + globby "^9.2.0" init-package-json "^1.10.3" npm-package-arg "^6.1.0" p-reduce "^1.0.0" - pacote "^9.5.0" - pify "^3.0.0" - semver "^5.5.0" - slash "^1.0.0" + pify "^4.0.1" + semver "^6.2.0" + slash "^2.0.0" validate-npm-package-license "^3.0.3" validate-npm-package-name "^3.0.0" whatwg-url "^7.0.0" -"@lerna/describe-ref@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.13.3.tgz#13318513613f6a407d37fc5dc025ec2cfb705606" - integrity sha512-5KcLTvjdS4gU5evW8ESbZ0BF44NM5HrP3dQNtWnOUSKJRgsES8Gj0lq9AlB2+YglZfjEftFT03uOYOxnKto4Uw== +"@lerna/describe-ref@3.14.2": + version "3.14.2" + resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-3.14.2.tgz#edc3c973f5ca9728d23358c4f4d3b55a21f65be5" + integrity sha512-qa5pzDRK2oBQXNjyRmRnN7E8a78NMYfQjjlRFB0KNHMsT6mCiL9+8kIS39sSE2NqT8p7xVNo2r2KAS8R/m3CoQ== dependencies: - "@lerna/child-process" "3.13.3" + "@lerna/child-process" "3.14.2" npmlog "^4.1.2" -"@lerna/diff@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.13.3.tgz#883cb3a83a956dbfc2c17bc9a156468a5d3fae17" - integrity sha512-/DRS2keYbnKaAC+5AkDyZRGkP/kT7v1GlUS0JGZeiRDPQ1H6PzhX09EgE5X6nj0Ytrm0sUasDeN++CDVvgaI+A== +"@lerna/diff@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-3.16.0.tgz#6d09a786f9f5b343a2fdc460eb0be08a05b420aa" + integrity sha512-QUpVs5TPl8vBIne10/vyjUxanQBQQp7Lk3iaB8MnCysKr0O+oy7trWeFVDPEkBTCD177By7yPGyW5Yey1nCBbA== dependencies: - "@lerna/child-process" "3.13.3" - "@lerna/command" "3.13.3" + "@lerna/child-process" "3.14.2" + "@lerna/command" "3.16.0" "@lerna/validation-error" "3.13.0" npmlog "^4.1.2" -"@lerna/exec@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.13.3.tgz#5d2eda3f6e584f2f15b115e8a4b5bc960ba5de85" - integrity sha512-c0bD4XqM96CTPV8+lvkxzE7mkxiFyv/WNM4H01YvvbFAJzk+S4Y7cBtRkIYFTfkFZW3FLo8pEgtG1ONtIdM+tg== +"@lerna/exec@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-3.16.0.tgz#2b6c033cee46181b6eede0eb12aad5c2c0181e89" + integrity sha512-mH3O5NXf/O88jBaBBTUf+d56CUkxpg782s3Jxy7HWbVuSUULt3iMRPTh+zEXO5/555etsIVVDDyUR76meklrJA== dependencies: - "@lerna/batch-packages" "3.13.0" - "@lerna/child-process" "3.13.3" - "@lerna/command" "3.13.3" - "@lerna/filter-options" "3.13.3" - "@lerna/run-parallel-batches" "3.13.0" + "@lerna/child-process" "3.14.2" + "@lerna/command" "3.16.0" + "@lerna/filter-options" "3.16.0" + "@lerna/run-topologically" "3.16.0" "@lerna/validation-error" "3.13.0" + p-map "^2.1.0" -"@lerna/filter-options@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.13.3.tgz#aa42a4ab78837b8a6c4278ba871d27e92d77c54f" - integrity sha512-DbtQX4eRgrBz1wCFWRP99JBD7ODykYme9ykEK79+RrKph40znhJQRlLg4idogj6IsUEzwo1OHjihCzSfnVo6Cg== +"@lerna/filter-options@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-3.16.0.tgz#b1660b4480c02a5c6efa4d0cd98b9afde4ed0bba" + integrity sha512-InIi1fF8+PxpCwir9bIy+pGxrdE6hvN0enIs1eNGCVS1TTE8osNgiZXa838bMQ1yaEccdcnVX6Z03BNKd56kNg== dependencies: - "@lerna/collect-updates" "3.13.3" - "@lerna/filter-packages" "3.13.0" + "@lerna/collect-updates" "3.16.0" + "@lerna/filter-packages" "3.16.0" dedent "^0.7.0" -"@lerna/filter-packages@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.13.0.tgz#f5371249e7e1a15928e5e88c544a242e0162c21c" - integrity sha512-RWiZWyGy3Mp7GRVBn//CacSnE3Kw82PxE4+H6bQ3pDUw/9atXn7NRX+gkBVQIYeKamh7HyumJtyOKq3Pp9BADQ== +"@lerna/filter-packages@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-3.16.0.tgz#7d34dc8530c71016263d6f67dc65308ecf11c9fc" + integrity sha512-eGFzQTx0ogkGDCnbTuXqssryR6ilp8+dcXt6B+aq1MaqL/vOJRZyqMm4TY3CUOUnzZCi9S2WWyMw3PnAJOF+kg== dependencies: "@lerna/validation-error" "3.13.0" - multimatch "^2.1.0" + multimatch "^3.0.0" npmlog "^4.1.2" "@lerna/get-npm-exec-opts@3.13.0": @@ -1086,158 +1067,177 @@ dependencies: npmlog "^4.1.2" -"@lerna/get-packed@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.13.0.tgz#335e40d77f3c1855aa248587d3e0b2d8f4b06e16" - integrity sha512-EgSim24sjIjqQDC57bgXD9l22/HCS93uQBbGpkzEOzxAVzEgpZVm7Fm1t8BVlRcT2P2zwGnRadIvxTbpQuDPTg== +"@lerna/get-packed@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-3.16.0.tgz#1b316b706dcee86c7baa55e50b087959447852ff" + integrity sha512-AjsFiaJzo1GCPnJUJZiTW6J1EihrPkc2y3nMu6m3uWFxoleklsSCyImumzVZJssxMi3CPpztj8LmADLedl9kXw== dependencies: - fs-extra "^7.0.0" + fs-extra "^8.1.0" ssri "^6.0.1" tar "^4.4.8" -"@lerna/github-client@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.13.3.tgz#bcf9b4ff40bdd104cb40cd257322f052b41bb9ce" - integrity sha512-fcJkjab4kX0zcLLSa/DCUNvU3v8wmy2c1lhdIbL7s7gABmDcV0QZq93LhnEee3VkC9UpnJ6GKG4EkD7eIifBnA== +"@lerna/github-client@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-3.16.0.tgz#619874e461641d4f59ab1b3f1a7ba22dba88125d" + integrity sha512-IVJjcKjkYaUEPJsDyAblHGEFFNKCRyMagbIDm14L7Ab94ccN6i4TKOqAFEJn2SJHYvKKBdp3Zj2zNlASOMe3DA== dependencies: - "@lerna/child-process" "3.13.3" - "@octokit/plugin-enterprise-rest" "^2.1.1" - "@octokit/rest" "^16.16.0" + "@lerna/child-process" "3.14.2" + "@octokit/plugin-enterprise-rest" "^3.6.1" + "@octokit/rest" "^16.28.4" git-url-parse "^11.1.2" npmlog "^4.1.2" +"@lerna/gitlab-client@3.15.0": + version "3.15.0" + resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-3.15.0.tgz#91f4ec8c697b5ac57f7f25bd50fe659d24aa96a6" + integrity sha512-OsBvRSejHXUBMgwWQqNoioB8sgzL/Pf1pOUhHKtkiMl6aAWjklaaq5HPMvTIsZPfS6DJ9L5OK2GGZuooP/5c8Q== + dependencies: + node-fetch "^2.5.0" + npmlog "^4.1.2" + whatwg-url "^7.0.0" + "@lerna/global-options@3.13.0": version "3.13.0" resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-3.13.0.tgz#217662290db06ad9cf2c49d8e3100ee28eaebae1" integrity sha512-SlZvh1gVRRzYLVluz9fryY1nJpZ0FHDGB66U9tFfvnnxmueckRQxLopn3tXj3NU1kc3QANT2I5BsQkOqZ4TEFQ== -"@lerna/has-npm-version@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.13.3.tgz#167e3f602a2fb58f84f93cf5df39705ca6432a2d" - integrity sha512-mQzoghRw4dBg0R9FFfHrj0TH0glvXyzdEZmYZ8Isvx5BSuEEwpsryoywuZSdppcvLu8o7NAdU5Tac8cJ/mT52w== +"@lerna/has-npm-version@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-3.16.0.tgz#55764a4ce792f0c8553cf996a17f554b9e843288" + integrity sha512-TIY036dA9J8OyTrZq9J+it2DVKifL65k7hK8HhkUPpitJkw6jwbMObA/8D40LOGgWNPweJWqmlrTbRSwsR7DrQ== dependencies: - "@lerna/child-process" "3.13.3" - semver "^5.5.0" + "@lerna/child-process" "3.14.2" + semver "^6.2.0" -"@lerna/import@3.13.4": - version "3.13.4" - resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.13.4.tgz#e9a1831b8fed33f3cbeab3b84c722c9371a2eaf7" - integrity sha512-dn6eNuPEljWsifBEzJ9B6NoaLwl/Zvof7PBUPA4hRyRlqG5sXRn6F9DnusMTovvSarbicmTURbOokYuotVWQQA== +"@lerna/import@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/import/-/import-3.16.0.tgz#b57cb453f4acfc60f6541fcbba10674055cb179d" + integrity sha512-trsOmGHzw0rL/f8BLNvd+9PjoTkXq2Dt4/V2UCha254hMQaYutbxcYu8iKPxz9x86jSPlH7FpbTkkHXDsoY7Yg== dependencies: - "@lerna/child-process" "3.13.3" - "@lerna/command" "3.13.3" + "@lerna/child-process" "3.14.2" + "@lerna/command" "3.16.0" "@lerna/prompt" "3.13.0" "@lerna/pulse-till-done" "3.13.0" "@lerna/validation-error" "3.13.0" dedent "^0.7.0" - fs-extra "^7.0.0" + fs-extra "^8.1.0" p-map-series "^1.0.0" -"@lerna/init@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.13.3.tgz#ebd522fee9b9d7d3b2dacb0261eaddb4826851ff" - integrity sha512-bK/mp0sF6jT0N+c+xrbMCqN4xRoiZCXQzlYsyACxPK99KH/mpHv7hViZlTYUGlYcymtew6ZC770miv5A9wF9hA== - dependencies: - "@lerna/child-process" "3.13.3" - "@lerna/command" "3.13.3" - fs-extra "^7.0.0" - p-map "^1.2.0" - write-json-file "^2.3.0" - -"@lerna/link@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.13.3.tgz#11124d4a0c8d0b79752fbda3babedfd62dd57847" - integrity sha512-IHhtdhA0KlIdevCsq6WHkI2rF3lHWHziJs2mlrEWAKniVrFczbELON1KJAgdJS1k3kAP/WeWVqmIYZ2hJDxMvg== - dependencies: - "@lerna/command" "3.13.3" - "@lerna/package-graph" "3.13.0" - "@lerna/symlink-dependencies" "3.13.0" - p-map "^1.2.0" - slash "^1.0.0" +"@lerna/init@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/init/-/init-3.16.0.tgz#31e0d66bbededee603338b487a42674a072b7a7d" + integrity sha512-Ybol/x5xMtBgokx4j7/Y3u0ZmNh0NiSWzBFVaOs2NOJKvuqrWimF67DKVz7yYtTYEjtaMdug64ohFF4jcT/iag== + dependencies: + "@lerna/child-process" "3.14.2" + "@lerna/command" "3.16.0" + fs-extra "^8.1.0" + p-map "^2.1.0" + write-json-file "^3.2.0" + +"@lerna/link@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/link/-/link-3.16.2.tgz#6c3a5658f6448a64dddca93d9348ac756776f6f6" + integrity sha512-eCPg5Lo8HT525fIivNoYF3vWghO3UgEVFdbsiPmhzwI7IQyZro5HWYzLtywSAdEog5XZpd2Bbn0CsoHWBB3gww== + dependencies: + "@lerna/command" "3.16.0" + "@lerna/package-graph" "3.16.0" + "@lerna/symlink-dependencies" "3.16.2" + p-map "^2.1.0" + slash "^2.0.0" -"@lerna/list@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.13.3.tgz#fa93864d43cadeb4cd540a4e78a52886c57dbe74" - integrity sha512-rLRDsBCkydMq2FL6WY1J/elvnXIjxxRtb72lfKHdvDEqVdquT5Qgt9ci42hwjmcocFwWcFJgF6BZozj5pbc13A== +"@lerna/list@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/list/-/list-3.16.0.tgz#883c00b2baf1e03c93e54391372f67a01b773c2f" + integrity sha512-TkvstoPsgKqqQ0KfRumpsdMXfRSEhdXqOLq519XyI5IRWYxhoqXqfi8gG37UoBPhBNoe64japn5OjphF3rOmQA== dependencies: - "@lerna/command" "3.13.3" - "@lerna/filter-options" "3.13.3" - "@lerna/listable" "3.13.0" + "@lerna/command" "3.16.0" + "@lerna/filter-options" "3.16.0" + "@lerna/listable" "3.16.0" "@lerna/output" "3.13.0" -"@lerna/listable@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.13.0.tgz#babc18442c590b549cf0966d20d75fea066598d4" - integrity sha512-liYJ/WBUYP4N4MnSVZuLUgfa/jy3BZ02/1Om7xUY09xGVSuNVNEeB8uZUMSC+nHqFHIsMPZ8QK9HnmZb1E/eTA== +"@lerna/listable@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-3.16.0.tgz#e6dc47a2d5a6295222663486f50e5cffc580f043" + integrity sha512-mtdAT2EEECqrJSDm/aXlOUFr1MRE4p6hppzY//Klp05CogQy6uGaKk+iKG5yyCLaOXFFZvG4HfO11CmoGSDWzw== dependencies: - "@lerna/batch-packages" "3.13.0" + "@lerna/query-graph" "3.16.0" chalk "^2.3.1" columnify "^1.5.4" -"@lerna/log-packed@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.13.0.tgz#497b5f692a8d0e3f669125da97b0dadfd9e480f3" - integrity sha512-Rmjrcz+6aM6AEcEVWmurbo8+AnHOvYtDpoeMMJh9IZ9SmZr2ClXzmD7wSvjTQc8BwOaiWjjC/ukcT0UYA2m7wg== +"@lerna/log-packed@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-3.16.0.tgz#f83991041ee77b2495634e14470b42259fd2bc16" + integrity sha512-Fp+McSNBV/P2mnLUYTaSlG8GSmpXM7krKWcllqElGxvAqv6chk2K3c2k80MeVB4WvJ9tRjUUf+i7HUTiQ9/ckQ== dependencies: - byte-size "^4.0.3" + byte-size "^5.0.1" columnify "^1.5.4" has-unicode "^2.0.1" npmlog "^4.1.2" -"@lerna/npm-conf@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.13.0.tgz#6b434ed75ff757e8c14381b9bbfe5d5ddec134a7" - integrity sha512-Jg2kANsGnhg+fbPEzE0X9nX5oviEAvWj0nYyOkcE+cgWuT7W0zpnPXC4hA4C5IPQGhwhhh0IxhWNNHtjTuw53g== +"@lerna/npm-conf@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-3.16.0.tgz#1c10a89ae2f6c2ee96962557738685300d376827" + integrity sha512-HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA== dependencies: config-chain "^1.1.11" - pify "^3.0.0" + pify "^4.0.1" -"@lerna/npm-dist-tag@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.13.0.tgz#49ecbe0e82cbe4ad4a8ea6de112982bf6c4e6cd4" - integrity sha512-mcuhw34JhSRFrbPn0vedbvgBTvveG52bR2lVE3M3tfE8gmR/cKS/EJFO4AUhfRKGCTFn9rjaSEzlFGYV87pemQ== +"@lerna/npm-dist-tag@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-3.16.0.tgz#b2184cee5e1f291277396854820e1117a544b7ee" + integrity sha512-MQrBkqJJB9+eNphuj9w90QPMOs4NQXMuSRk9NqzeFunOmdDopPCV0Q7IThSxEuWnhJ2n3B7G0vWUP7tNMPdqIQ== dependencies: + "@evocateur/npm-registry-fetch" "^4.0.0" + "@lerna/otplease" "3.16.0" figgy-pudding "^3.5.1" npm-package-arg "^6.1.0" - npm-registry-fetch "^3.9.0" npmlog "^4.1.2" -"@lerna/npm-install@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.13.3.tgz#9b09852732e51c16d2e060ff2fd8bfbbb49cf7ba" - integrity sha512-7Jig9MLpwAfcsdQ5UeanAjndChUjiTjTp50zJ+UZz4CbIBIDhoBehvNMTCL2G6pOEC7sGEg6sAqJINAqred6Tg== +"@lerna/npm-install@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-3.16.0.tgz#8ec76a7a13b183bde438fd46296bf7a0d6f86017" + integrity sha512-APUOIilZCzDzce92uLEwzt1r7AEMKT/hWA1ThGJL+PO9Rn8A95Km3o2XZAYG4W0hR+P4O2nSVuKbsjQtz8CjFQ== dependencies: - "@lerna/child-process" "3.13.3" + "@lerna/child-process" "3.14.2" "@lerna/get-npm-exec-opts" "3.13.0" - fs-extra "^7.0.0" + fs-extra "^8.1.0" npm-package-arg "^6.1.0" npmlog "^4.1.2" signal-exit "^3.0.2" write-pkg "^3.1.0" -"@lerna/npm-publish@3.13.2": - version "3.13.2" - resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.13.2.tgz#ad713ca6f91a852687d7d0e1bda7f9c66df21768" - integrity sha512-HMucPyEYZfom5tRJL4GsKBRi47yvSS2ynMXYxL3kO0ie+j9J7cb0Ir8NmaAMEd3uJWJVFCPuQarehyfTDZsSxg== +"@lerna/npm-publish@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-3.16.2.tgz#a850b54739446c4aa766a0ceabfa9283bb0be676" + integrity sha512-tGMb9vfTxP57vUV5svkBQxd5Tzc+imZbu9ZYf8Mtwe0+HYfDjNiiHLIQw7G95w4YRdc5KsCE8sQ0uSj+f2soIg== dependencies: - "@lerna/run-lifecycle" "3.13.0" + "@evocateur/libnpmpublish" "^1.2.2" + "@lerna/otplease" "3.16.0" + "@lerna/run-lifecycle" "3.16.2" figgy-pudding "^3.5.1" - fs-extra "^7.0.0" - libnpmpublish "^1.1.1" + fs-extra "^8.1.0" npm-package-arg "^6.1.0" npmlog "^4.1.2" - pify "^3.0.0" + pify "^4.0.1" read-package-json "^2.0.13" -"@lerna/npm-run-script@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.13.3.tgz#9bb6389ed70cd506905d6b05b6eab336b4266caf" - integrity sha512-qR4o9BFt5hI8Od5/DqLalOJydnKpiQFEeN0h9xZi7MwzuX1Ukwh3X22vqsX4YRbipIelSFtrDzleNVUm5jj0ow== +"@lerna/npm-run-script@3.14.2": + version "3.14.2" + resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-3.14.2.tgz#8c518ea9d241a641273e77aad6f6fddc16779c3f" + integrity sha512-LbVFv+nvAoRTYLMrJlJ8RiakHXrLslL7Jp/m1R18vYrB8LYWA3ey+nz5Tel2OELzmjUiemAKZsD9h6i+Re5egg== dependencies: - "@lerna/child-process" "3.13.3" + "@lerna/child-process" "3.14.2" "@lerna/get-npm-exec-opts" "3.13.0" npmlog "^4.1.2" +"@lerna/otplease@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-3.16.0.tgz#de66aec4f3e835a465d7bea84b58a4ab6590a0fa" + integrity sha512-uqZ15wYOHC+/V0WnD2iTLXARjvx3vNrpiIeyIvVlDB7rWse9mL4egex/QSgZ+lDx1OID7l2kgvcUD9cFpbqB7Q== + dependencies: + "@lerna/prompt" "3.13.0" + figgy-pudding "^3.5.1" + "@lerna/output@3.13.0": version "3.13.0" resolved "https://registry.yarnpkg.com/@lerna/output/-/output-3.13.0.tgz#3ded7cc908b27a9872228a630d950aedae7a4989" @@ -1245,55 +1245,64 @@ dependencies: npmlog "^4.1.2" -"@lerna/pack-directory@3.13.1": - version "3.13.1" - resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.13.1.tgz#5ad4d0945f86a648f565e24d53c1e01bb3a912d1" - integrity sha512-kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA== +"@lerna/pack-directory@3.16.4": + version "3.16.4" + resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-3.16.4.tgz#3eae5f91bdf5acfe0384510ed53faddc4c074693" + integrity sha512-uxSF0HZeGyKaaVHz5FroDY9A5NDDiCibrbYR6+khmrhZtY0Bgn6hWq8Gswl9iIlymA+VzCbshWIMX4o2O8C8ng== dependencies: - "@lerna/get-packed" "3.13.0" - "@lerna/package" "3.13.0" - "@lerna/run-lifecycle" "3.13.0" + "@lerna/get-packed" "3.16.0" + "@lerna/package" "3.16.0" + "@lerna/run-lifecycle" "3.16.2" figgy-pudding "^3.5.1" - npm-packlist "^1.4.1" + npm-packlist "^1.4.4" npmlog "^4.1.2" - tar "^4.4.8" + tar "^4.4.10" temp-write "^3.4.0" -"@lerna/package-graph@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.13.0.tgz#607062f8d2ce22b15f8d4a0623f384736e67f760" - integrity sha512-3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw== +"@lerna/package-graph@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-3.16.0.tgz#909c90fb41e02f2c19387342d2a5eefc36d56836" + integrity sha512-A2mum/gNbv7zCtAwJqoxzqv89As73OQNK2MgSX1SHWya46qoxO9a9Z2c5lOFQ8UFN5ZxqWMfFYXRCz7qzwmFXw== dependencies: + "@lerna/prerelease-id-from-version" "3.16.0" "@lerna/validation-error" "3.13.0" npm-package-arg "^6.1.0" - semver "^5.5.0" + npmlog "^4.1.2" + semver "^6.2.0" -"@lerna/package@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.13.0.tgz#4baeebc49a57fc9b31062cc59f5ee38384429fc8" - integrity sha512-kSKO0RJQy093BufCQnkhf1jB4kZnBvL7kK5Ewolhk5gwejN+Jofjd8DGRVUDUJfQ0CkW1o6GbUeZvs8w8VIZDg== +"@lerna/package@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/package/-/package-3.16.0.tgz#7e0a46e4697ed8b8a9c14d59c7f890e0d38ba13c" + integrity sha512-2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw== dependencies: - load-json-file "^4.0.0" + load-json-file "^5.3.0" npm-package-arg "^6.1.0" write-pkg "^3.1.0" -"@lerna/project@3.13.1": - version "3.13.1" - resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.13.1.tgz#bce890f60187bd950bcf36c04b5260642e295e79" - integrity sha512-/GoCrpsCCTyb9sizk1+pMBrIYchtb+F1uCOn3cjn9yenyG/MfYEnlfrbV5k/UDud0Ei75YBLbmwCbigHkAKazQ== +"@lerna/prerelease-id-from-version@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-3.16.0.tgz#b24bfa789f5e1baab914d7b08baae9b7bd7d83a1" + integrity sha512-qZyeUyrE59uOK8rKdGn7jQz+9uOpAaF/3hbslJVFL1NqF9ELDTqjCPXivuejMX/lN4OgD6BugTO4cR7UTq/sZA== + dependencies: + semver "^6.2.0" + +"@lerna/project@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/project/-/project-3.16.0.tgz#2469a4e346e623fd922f38f5a12931dfb8f2a946" + integrity sha512-NrKcKK1EqXqhrGvslz6Q36+ZHuK3zlDhGdghRqnxDcHxMPT01NgLcmsnymmQ+gjMljuLRmvKYYCuHrknzX8VrA== dependencies: - "@lerna/package" "3.13.0" + "@lerna/package" "3.16.0" "@lerna/validation-error" "3.13.0" cosmiconfig "^5.1.0" dedent "^0.7.0" dot-prop "^4.2.0" - glob-parent "^3.1.0" - globby "^8.0.1" - load-json-file "^4.0.0" + glob-parent "^5.0.0" + globby "^9.2.0" + load-json-file "^5.3.0" npmlog "^4.1.2" - p-map "^1.2.0" + p-map "^2.1.0" resolve-from "^4.0.0" - write-json-file "^2.3.0" + write-json-file "^3.2.0" "@lerna/prompt@3.13.0": version "3.13.0" @@ -1303,41 +1312,41 @@ inquirer "^6.2.0" npmlog "^4.1.2" -"@lerna/publish@3.13.4": - version "3.13.4" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.13.4.tgz#25b678c285110897a7fc5198a35bdfa9db7f9cc1" - integrity sha512-v03pabiPlqCDwX6cVNis1PDdT6/jBgkVb5Nl4e8wcJXevIhZw3ClvtI94gSZu/wdoVFX0RMfc8QBVmaimSO0qg== - dependencies: - "@lerna/batch-packages" "3.13.0" - "@lerna/check-working-tree" "3.13.3" - "@lerna/child-process" "3.13.3" - "@lerna/collect-updates" "3.13.3" - "@lerna/command" "3.13.3" - "@lerna/describe-ref" "3.13.3" - "@lerna/log-packed" "3.13.0" - "@lerna/npm-conf" "3.13.0" - "@lerna/npm-dist-tag" "3.13.0" - "@lerna/npm-publish" "3.13.2" +"@lerna/publish@3.16.4": + version "3.16.4" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.16.4.tgz#4cd55d8be9943d9a68e316e930a90cda8590500e" + integrity sha512-XZY+gRuF7/v6PDQwl7lvZaGWs8CnX6WIPIu+OCcyFPSL/rdWegdN7HieKBHskgX798qRQc2GrveaY7bNoTKXAw== + dependencies: + "@evocateur/libnpmaccess" "^3.1.2" + "@evocateur/npm-registry-fetch" "^4.0.0" + "@evocateur/pacote" "^9.6.3" + "@lerna/check-working-tree" "3.14.2" + "@lerna/child-process" "3.14.2" + "@lerna/collect-updates" "3.16.0" + "@lerna/command" "3.16.0" + "@lerna/describe-ref" "3.14.2" + "@lerna/log-packed" "3.16.0" + "@lerna/npm-conf" "3.16.0" + "@lerna/npm-dist-tag" "3.16.0" + "@lerna/npm-publish" "3.16.2" + "@lerna/otplease" "3.16.0" "@lerna/output" "3.13.0" - "@lerna/pack-directory" "3.13.1" + "@lerna/pack-directory" "3.16.4" + "@lerna/prerelease-id-from-version" "3.16.0" "@lerna/prompt" "3.13.0" "@lerna/pulse-till-done" "3.13.0" - "@lerna/run-lifecycle" "3.13.0" - "@lerna/run-parallel-batches" "3.13.0" + "@lerna/run-lifecycle" "3.16.2" + "@lerna/run-topologically" "3.16.0" "@lerna/validation-error" "3.13.0" - "@lerna/version" "3.13.4" + "@lerna/version" "3.16.4" figgy-pudding "^3.5.1" - fs-extra "^7.0.0" - libnpmaccess "^3.0.1" + fs-extra "^8.1.0" npm-package-arg "^6.1.0" - npm-registry-fetch "^3.9.0" npmlog "^4.1.2" p-finally "^1.0.0" - p-map "^1.2.0" + p-map "^2.1.0" p-pipe "^1.2.0" - p-reduce "^1.0.0" - pacote "^9.5.0" - semver "^5.5.0" + semver "^6.2.0" "@lerna/pulse-till-done@3.13.0": version "3.13.0" @@ -1346,79 +1355,95 @@ dependencies: npmlog "^4.1.2" -"@lerna/resolve-symlink@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.13.0.tgz#3e6809ef53b63fe914814bfa071cd68012e22fbb" - integrity sha512-Lc0USSFxwDxUs5JvIisS8JegjA6SHSAWJCMvi2osZx6wVRkEDlWG2B1JAfXUzCMNfHoZX0/XX9iYZ+4JIpjAtg== +"@lerna/query-graph@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-3.16.0.tgz#e6a46ebcd9d5b03f018a06eca2b471735353953c" + integrity sha512-p0RO+xmHDO95ChJdWkcy9TNLysLkoDARXeRHzY5U54VCwl3Ot/2q8fMCVlA5UeGXDutEyyByl3URqEpcQCWI7Q== + dependencies: + "@lerna/package-graph" "3.16.0" + figgy-pudding "^3.5.1" + +"@lerna/resolve-symlink@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-3.16.0.tgz#37fc7095fabdbcf317c26eb74e0d0bde8efd2386" + integrity sha512-Ibj5e7njVHNJ/NOqT4HlEgPFPtPLWsO7iu59AM5bJDcAJcR96mLZ7KGVIsS2tvaO7akMEJvt2P+ErwCdloG3jQ== dependencies: - fs-extra "^7.0.0" + fs-extra "^8.1.0" npmlog "^4.1.2" read-cmd-shim "^1.0.1" -"@lerna/rimraf-dir@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.13.3.tgz#3a8e71317fde853893ef0262bc9bba6a180b7227" - integrity sha512-d0T1Hxwu3gpYVv73ytSL+/Oy8JitsmvOYUR5ouRSABsmqS7ZZCh5t6FgVDDGVXeuhbw82+vuny1Og6Q0k4ilqw== +"@lerna/rimraf-dir@3.14.2": + version "3.14.2" + resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-3.14.2.tgz#103a49882abd85d42285d05cc76869b89f21ffd2" + integrity sha512-eFNkZsy44Bu9v1Hrj5Zk6omzg8O9h/7W6QYK1TTUHeyrjTEwytaNQlqF0lrTLmEvq55sviV42NC/8P3M2cvq8Q== dependencies: - "@lerna/child-process" "3.13.3" + "@lerna/child-process" "3.14.2" npmlog "^4.1.2" path-exists "^3.0.0" rimraf "^2.6.2" -"@lerna/run-lifecycle@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.13.0.tgz#d8835ee83425edee40f687a55f81b502354d3261" - integrity sha512-oyiaL1biZdjpmjh6X/5C4w07wNFyiwXSSHH5GQB4Ay4BPwgq9oNhCcxRoi0UVZlZ1YwzSW8sTwLgj8emkIo3Yg== +"@lerna/run-lifecycle@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-3.16.2.tgz#67b288f8ea964db9ea4fb1fbc7715d5bbb0bce00" + integrity sha512-RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A== dependencies: - "@lerna/npm-conf" "3.13.0" + "@lerna/npm-conf" "3.16.0" figgy-pudding "^3.5.1" - npm-lifecycle "^2.1.0" + npm-lifecycle "^3.1.2" npmlog "^4.1.2" -"@lerna/run-parallel-batches@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.13.0.tgz#0276bb4e7cd0995297db82d134ca2bd08d63e311" - integrity sha512-bICFBR+cYVF1FFW+Tlm0EhWDioTUTM6dOiVziDEGE1UZha1dFkMYqzqdSf4bQzfLS31UW/KBd/2z8jy2OIjEjg== +"@lerna/run-parallel-batches@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/run-parallel-batches/-/run-parallel-batches-3.16.0.tgz#5ace7911a2dd31dfd1e53c61356034e27df0e1fb" + integrity sha512-2J/Nyv+MvogmQEfC7VcS21ifk7w0HVvzo2yOZRPvkCzGRu/rducxtB4RTcr58XCZ8h/Bt1aqQYKExu3c/3GXwg== dependencies: - p-map "^1.2.0" + p-map "^2.1.0" p-map-series "^1.0.0" -"@lerna/run@3.13.3": - version "3.13.3" - resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.13.3.tgz#0781c82d225ef6e85e28d3e763f7fc090a376a21" - integrity sha512-ygnLIfIYS6YY1JHWOM4CsdZiY8kTYPsDFOLAwASlRnlAXF9HiMT08GFXLmMHIblZJ8yJhsM2+QgraCB0WdxzOQ== +"@lerna/run-topologically@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-3.16.0.tgz#39e29cfc628bbc8e736d8e0d0e984997ac01bbf5" + integrity sha512-4Hlpv4zDtKWa5Z0tPkeu0sK+bxZEKgkNESMGmWrUCNfj7xwvAJurcraK8+a2Y0TFYwf0qjSLY/MzX+ZbJA3Cgw== + dependencies: + "@lerna/query-graph" "3.16.0" + figgy-pudding "^3.5.1" + p-queue "^4.0.0" + +"@lerna/run@3.16.0": + version "3.16.0" + resolved "https://registry.yarnpkg.com/@lerna/run/-/run-3.16.0.tgz#1ea568c6f303e47fa00b3403a457836d40738fd2" + integrity sha512-woTeLlB1OAAz4zzjdI6RyIxSGuxiUPHJZm89E1pDEPoWwtQV6HMdMgrsQd9ATsJ5Ez280HH4bF/LStAlqW8Ufg== dependencies: - "@lerna/batch-packages" "3.13.0" - "@lerna/command" "3.13.3" - "@lerna/filter-options" "3.13.3" - "@lerna/npm-run-script" "3.13.3" + "@lerna/command" "3.16.0" + "@lerna/filter-options" "3.16.0" + "@lerna/npm-run-script" "3.14.2" "@lerna/output" "3.13.0" - "@lerna/run-parallel-batches" "3.13.0" + "@lerna/run-topologically" "3.16.0" "@lerna/timer" "3.13.0" "@lerna/validation-error" "3.13.0" - p-map "^1.2.0" - -"@lerna/symlink-binary@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.13.0.tgz#36a9415d468afcb8105750296902f6f000a9680d" - integrity sha512-obc4Y6jxywkdaCe+DB0uTxYqP0IQ8mFWvN+k/YMbwH4G2h7M7lCBWgPy8e7xw/50+1II9tT2sxgx+jMus1sTJg== - dependencies: - "@lerna/create-symlink" "3.13.0" - "@lerna/package" "3.13.0" - fs-extra "^7.0.0" - p-map "^1.2.0" - -"@lerna/symlink-dependencies@3.13.0": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.13.0.tgz#76c23ecabda7824db98a0561364f122b457509cf" - integrity sha512-7CyN5WYEPkbPLbqHBIQg/YiimBzb5cIGQB0E9IkLs3+racq2vmUNQZn38LOaazQacAA83seB+zWSxlI6H+eXSg== - dependencies: - "@lerna/create-symlink" "3.13.0" - "@lerna/resolve-symlink" "3.13.0" - "@lerna/symlink-binary" "3.13.0" - fs-extra "^7.0.0" + p-map "^2.1.0" + +"@lerna/symlink-binary@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-3.16.2.tgz#f98a3d9da9e56f1d302dc0d5c2efeb951483ee66" + integrity sha512-kz9XVoFOGSF83gg4gBqH+mG6uxfJfTp8Uy+Cam40CvMiuzfODrGkjuBEFoM/uO2QOAwZvbQDYOBpKUa9ZxHS1Q== + dependencies: + "@lerna/create-symlink" "3.16.2" + "@lerna/package" "3.16.0" + fs-extra "^8.1.0" + p-map "^2.1.0" + +"@lerna/symlink-dependencies@3.16.2": + version "3.16.2" + resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-3.16.2.tgz#91d9909d35897aebd76a03644a00cd03c4128240" + integrity sha512-wnZqGJQ+Jvr1I3inxrkffrFZfmQI7Ta8gySw/UWCy95QtZWF/f5yk8zVIocCAsjzD0wgb3jJE3CFJ9W5iwWk1A== + dependencies: + "@lerna/create-symlink" "3.16.2" + "@lerna/resolve-symlink" "3.16.0" + "@lerna/symlink-binary" "3.16.2" + fs-extra "^8.1.0" p-finally "^1.0.0" - p-map "^1.2.0" + p-map "^2.1.0" p-map-series "^1.0.0" "@lerna/timer@3.13.0": @@ -1433,32 +1458,34 @@ dependencies: npmlog "^4.1.2" -"@lerna/version@3.13.4": - version "3.13.4" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.13.4.tgz#ea23b264bebda425ccbfcdcd1de13ef45a390e59" - integrity sha512-pptWUEgN/lUTQZu34+gfH1g4Uhs7TDKRcdZY9A4T9k6RTOwpKC2ceLGiXdeR+ZgQJAey2C4qiE8fo5Z6Rbc6QA== - dependencies: - "@lerna/batch-packages" "3.13.0" - "@lerna/check-working-tree" "3.13.3" - "@lerna/child-process" "3.13.3" - "@lerna/collect-updates" "3.13.3" - "@lerna/command" "3.13.3" - "@lerna/conventional-commits" "3.13.0" - "@lerna/github-client" "3.13.3" +"@lerna/version@3.16.4": + version "3.16.4" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.16.4.tgz#b5cc37f3ad98358d599c6196c30b6efc396d42bf" + integrity sha512-ikhbMeIn5ljCtWTlHDzO4YvTmpGTX1lWFFIZ79Vd1TNyOr+OUuKLo/+p06mCl2WEdZu0W2s5E9oxfAAQbyDxEg== + dependencies: + "@lerna/check-working-tree" "3.14.2" + "@lerna/child-process" "3.14.2" + "@lerna/collect-updates" "3.16.0" + "@lerna/command" "3.16.0" + "@lerna/conventional-commits" "3.16.4" + "@lerna/github-client" "3.16.0" + "@lerna/gitlab-client" "3.15.0" "@lerna/output" "3.13.0" + "@lerna/prerelease-id-from-version" "3.16.0" "@lerna/prompt" "3.13.0" - "@lerna/run-lifecycle" "3.13.0" + "@lerna/run-lifecycle" "3.16.2" + "@lerna/run-topologically" "3.16.0" "@lerna/validation-error" "3.13.0" chalk "^2.3.1" dedent "^0.7.0" minimatch "^3.0.4" npmlog "^4.1.2" - p-map "^1.2.0" + p-map "^2.1.0" p-pipe "^1.2.0" p-reduce "^1.0.0" p-waterfall "^1.0.0" - semver "^5.5.0" - slash "^1.0.0" + semver "^6.2.0" + slash "^2.0.0" temp-write "^3.4.0" "@lerna/write-log-file@3.13.0": @@ -1472,51 +1499,62 @@ "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" + integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g== dependencies: call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@nodelib/fs.stat@^1.0.1": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a" +"@nodelib/fs.scandir@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz#1f981cd5b83e85cfdeb386fc693d4baab392fa54" + integrity sha512-wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w== + dependencies: + "@nodelib/fs.stat" "2.0.2" + run-parallel "^1.1.9" -"@octokit/endpoint@^4.0.0": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-4.1.1.tgz#847075b85157c7bd60d0f23c426b23bed8a232dd" - integrity sha512-lfphGC9hglBDiIOU84f1xDUzjWE5j3jGkO3Ng/IpDDVARw760A+/x408JOEpdV20ZUj2GRWdDBC0+HPu5qA5gQ== +"@nodelib/fs.stat@2.0.2", "@nodelib/fs.stat@^2.0.1": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz#2762aea8fe78ea256860182dcb52d61ee4b8fda6" + integrity sha512-z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw== + +"@nodelib/fs.stat@^1.1.2": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" + integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== + +"@nodelib/fs.walk@^1.2.1": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz#a555dc256acaf00c62b0db29529028dd4d4cb141" + integrity sha512-l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA== dependencies: - deepmerge "3.2.0" - is-plain-object "^2.0.4" - universal-user-agent "^2.0.1" - url-template "^2.0.8" + "@nodelib/fs.scandir" "2.1.2" + fastq "^1.6.0" "@octokit/endpoint@^5.1.0": - version "5.3.2" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.3.2.tgz#2deda2d869cac9ba7f370287d55667be2a808d4b" - integrity sha512-gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw== + version "5.3.5" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.3.5.tgz#2822c3b01107806dbdce3863b6205e3eff4289ed" + integrity sha512-f8KqzIrnzPLiezDsZZPB+K8v8YSv6aKFl7eOu59O46lmlW4HagWl1U6NWl6LmT8d1w7NsKBI3paVtzcnRGO1gw== dependencies: - deepmerge "4.0.0" is-plain-object "^3.0.0" - universal-user-agent "^3.0.0" - url-template "^2.0.8" + universal-user-agent "^4.0.0" "@octokit/graphql@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.0.0.tgz#a1b872b43461f86a9be123cc9ede208b18f3b974" - integrity sha512-ewOTBEmdSorKeo95b+jFkoDMmQ47w1ivJm1wYlYHd5zfqjRnEpz66OqvpZavA+3uG+QHnOnRKfkA2kBZG2oY1w== + version "4.2.0" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.2.0.tgz#99e739f3cba12ab83136a8a82fffdbfa0715ed28" + integrity sha512-6JKVE2cJPZVIM1LLsy7M4rKcaE3r6dbP7o895FLEpClHeMDv1a+k3yANue0ycMhM1Es9/WEy8hjBaBpOBETw6A== dependencies: "@octokit/request" "^5.0.0" - universal-user-agent "^3.0.0" + universal-user-agent "^4.0.0" "@octokit/plugin-enterprise-compatibility@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-compatibility/-/plugin-enterprise-compatibility-1.1.1.tgz#1d4189d588eccb1bbc23cd72278129491cfba5d2" integrity sha512-/o09y5I1JJMGGTU2y//QXBKjILX0BaDgBK27NRBJPRxD4BsDVzIsRFQm7ejPWW3l2xOao8tvN7Yh73D5cXBBbg== -"@octokit/plugin-enterprise-rest@^2.1.1": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz#c0e22067a043e19f96ff9c7832e2a3019f9be75c" - integrity sha512-CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw== +"@octokit/plugin-enterprise-rest@^3.6.1": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561" + integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA== "@octokit/plugin-retry@^2.2.0": version "2.2.0" @@ -1540,22 +1578,10 @@ deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-3.0.0.tgz#304a279036b2dc89e7fba7cb30c9e6a9b1f4d2df" - integrity sha512-DZqmbm66tq+a9FtcKrn0sjrUpi0UaZ9QPUCxxyk/4CJ2rseTMpAWRf6gCwOSUCzZcx/4XVIsDk+kz5BVdaeenA== - dependencies: - "@octokit/endpoint" "^4.0.0" - deprecation "^1.0.1" - is-plain-object "^2.0.4" - node-fetch "^2.3.0" - once "^1.4.0" - universal-user-agent "^2.0.1" - "@octokit/request@^5.0.0": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.0.2.tgz#59a920451f24811c016ddc507adcc41aafb2dca5" - integrity sha512-z1BQr43g4kOL4ZrIVBMHwi68Yg9VbkRUyuAgqCp1rU3vbYa69+2gIld/+gHclw15bJWQnhqqyEb7h5a5EqgZ0A== + version "5.1.0" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.1.0.tgz#5609dcc7b5323e529f29d535214383d9eaf0c05c" + integrity sha512-I15T9PwjFs4tbWyhtFU2Kq7WDPidYMvRB7spmxoQRZfxSmiqullG+Nz+KbSmpkfnlvHwTr1e31R5WReFRKMXjg== dependencies: "@octokit/endpoint" "^5.1.0" "@octokit/request-error" "^1.0.1" @@ -1563,7 +1589,7 @@ is-plain-object "^3.0.0" node-fetch "^2.3.0" once "^1.4.0" - universal-user-agent "^3.0.0" + universal-user-agent "^4.0.0" "@octokit/rest@16.28.7": version "16.28.7" @@ -1584,46 +1610,69 @@ universal-user-agent "^3.0.0" url-template "^2.0.8" -"@octokit/rest@^16.16.0": - version "16.25.0" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.25.0.tgz#1111dc2b2058bc77442fd7fbd295dab3991b62bf" - integrity sha512-QKIzP0gNYjyIGmY3Gpm3beof0WFwxFR+HhRZ+Wi0fYYhkEUvkJiXqKF56Pf5glzzfhEwOrggfluEld5F/ZxsKw== +"@octokit/rest@^16.28.4": + version "16.29.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.29.0.tgz#5bbbfc818a44bb9ab32bee72cc0acc32e4556058" + integrity sha512-t01+Hz6sUJx2/HzY4KSgmST5n7KcTYr8i6+UwqS6TkgyjyA6YmeTxVhZrQUobEXaDdQFxs1dRhh1hgmOo6OF9Q== dependencies: - "@octokit/request" "3.0.0" + "@octokit/request" "^5.0.0" + "@octokit/request-error" "^1.0.2" atob-lite "^2.0.0" - before-after-hook "^1.4.0" + before-after-hook "^2.0.0" btoa-lite "^1.0.0" - deprecation "^1.0.1" + deprecation "^2.0.0" lodash.get "^4.4.2" lodash.set "^4.3.2" lodash.uniq "^4.5.0" octokit-pagination-methods "^1.1.0" once "^1.4.0" - universal-user-agent "^2.0.0" - url-template "^2.0.8" + universal-user-agent "^4.0.0" "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" + integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg== dependencies: any-observable "^0.3.0" +"@types/events@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" + integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== + +"@types/glob@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" + integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w== + dependencies: + "@types/events" "*" + "@types/minimatch" "*" + "@types/node" "*" + "@types/log-symbols@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/log-symbols/-/log-symbols-2.0.0.tgz#7919e2ec3c8d13879bfdcab310dd7a3f7fc9466d" + integrity sha512-YJhbp0sz3egFFKl3BcCNPQKzuGFOP4PACcsifhK6ROGnJUW9ViYLuLybQ9GQZm7Zejy3tkGuiXYMq3GiyGkU4g== + +"@types/minimatch@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" + integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/mocha@^5.2.5": - version "5.2.5" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.5.tgz#8a4accfc403c124a0bafe8a9fc61a05ec1032073" +"@types/mocha@^5.2.7": + version "5.2.7" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea" + integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ== -"@types/node@*": - version "10.9.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.2.tgz#f0ab8dced5cd6c56b26765e1c0d9e4fdcc9f2a00" +"@types/node@*", "@types/node@^12.7.5": + version "12.7.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f" + integrity sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w== -"@types/node@^12.6.8": - version "12.6.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c" - integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg== +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== "@types/parsimmon@^1.3.0": version "1.10.0" @@ -1635,16 +1684,19 @@ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.2.tgz#fd4b676846fe731a5de5c6d2e5ef6a377262fc30" integrity sha512-zG61PAp2OcoIBjRV44wftJj6AJgzJrOc32LCYOBqk9bdgcdzK5DCJHV9QZJ60+Fu+fOn79g8Ks3Gixm4CfkZ+w== -JSONStream@^1.0.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf" +"@zkochan/cmd-shim@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e" + integrity sha512-o8l0+x7C7sMZU3v9GuJIAU10qQLtwR1dtRQIOmlNMtyaqhmpXOzx1HWiYoWfmmf9HHZoAkXpc9TM9PQYF9d4Jg== dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" + is-windows "^1.0.0" + mkdirp-promise "^5.0.1" + mz "^2.5.0" -JSONStream@^1.0.4, JSONStream@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e" +JSONStream@^1.0.3, JSONStream@^1.0.4, JSONStream@^1.3.4: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== dependencies: jsonparse "^1.2.0" through ">=2.2.7 <3" @@ -1652,135 +1704,135 @@ JSONStream@^1.0.4, JSONStream@^1.3.4: abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.4, accepts@~1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" +accepts@~1.3.4, accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== dependencies: - mime-types "~2.1.18" - negotiator "0.6.1" + mime-types "~2.1.24" + negotiator "0.6.2" -acorn-dynamic-import@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" - dependencies: - acorn "^5.0.0" +acorn-jsx@^5.0.0, acorn-jsx@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" + integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw== -acorn-jsx@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e" +acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1: + version "1.8.2" + resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== dependencies: - acorn "^5.0.3" + acorn "^7.0.0" + acorn-walk "^7.0.0" + xtend "^4.0.2" -acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.5.2.tgz#2ca723df19d997b05824b69f6c7fb091fc42c322" - dependencies: - acorn "^5.7.1" - acorn-dynamic-import "^3.0.0" - xtend "^4.0.1" +acorn-walk@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.0.0.tgz#c8ba6f0f1aac4b0a9e32d1f0af12be769528f36b" + integrity sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg== -acorn@^5.0.0, acorn@^5.0.3, acorn@^5.6.0, acorn@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" +acorn@^6.0.2, acorn@^6.0.7: + version "6.3.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" + integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== + +acorn@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" + integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" + integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= -agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0: +agent-base@4, agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + +agent-base@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" + integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== dependencies: es6-promisify "^5.0.0" agentkeepalive@^3.4.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.1.tgz#4eba75cf2ad258fc09efd506cdb8d8c2971d35a4" + version "3.5.2" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67" + integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ== dependencies: humanize-ms "^1.2.1" -ajv-keywords@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" - -ajv@^5.3.0: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - -ajv@^6.0.1: - version "6.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" +aggregate-error@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.0.tgz#5b5a3c95e9095f311c9ab16c19fb4f3527cd3f79" + integrity sha512-yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA== dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.1" + clean-stack "^2.0.0" + indent-string "^3.2.0" -ajv@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59" +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1: + version "6.10.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" + integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - ansi-align@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" + integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= dependencies: string-width "^2.0.0" +ansi-colors@3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813" + integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw== + ansi-colors@^3.2.1: version "3.2.4" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== -ansi-escapes@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" - -ansi-escapes@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b" - -ansi-escapes@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" +ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== dependencies: color-convert "^1.9.0" @@ -1791,46 +1843,55 @@ any-base@^1.1.0: any-observable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" + integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" + integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== dependencies: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.0.tgz#e609350e50a9313b472789b2f14ef35808ee14d6" + integrity sha512-Ozz7l4ixzI7Oxj2+cw+p0tVUt27BpaJ+1+q1TCeANWxHpvyn2+Un+YamBdfKu0uh8xLodGhoa1v7595NhKDAuA== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + append-transform@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab" + integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw== dependencies: default-require-extensions "^2.0.0" aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== aproba@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== archy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= are-we-there-yet@~1.1.2: version "1.1.5" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" @@ -1838,26 +1899,24 @@ are-we-there-yet@~1.1.2: argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== dependencies: sprintf-js "~1.0.2" -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= -arr-flatten@^1.0.1, arr-flatten@^1.1.0: +arr-flatten@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= array-back@^3.0.1, array-back@^3.1.0: version "3.1.0" @@ -1867,69 +1926,77 @@ array-back@^3.0.1, array-back@^3.1.0: array-differ@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" + integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE= -array-filter@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" +array-differ@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-2.1.0.tgz#4b9c1c3f14b906757082925769e8ab904f4801b1" + integrity sha512-KbUpJgx909ZscOc/7CLATBFam7P1Z1QRQInvgT0UztM9Q72aGKCunKASAl7WNW0tnPmPyEMeMhdsfWhfmW037w== array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-ify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" + integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= -array-map@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" - -array-reduce@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" - -array-slice@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" +array-includes@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" + integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= + dependencies: + define-properties "^1.1.2" + es-abstract "^1.7.0" -array-union@^1.0.1: +array-union@^1.0.1, array-union@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= dependencies: array-uniq "^1.0.1" +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" + integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= arraybuffer.slice@~0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" + integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= asap@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= asn1.js@^4.0.0: version "4.10.1" resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" + integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== dependencies: bn.js "^4.0.0" inherits "^2.0.1" @@ -1938,38 +2005,54 @@ asn1.js@^4.0.0: asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== dependencies: safer-buffer "~2.1.0" assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= assert@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" + version "1.5.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" + integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== dependencies: + object-assign "^4.1.1" util "0.10.3" assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" +astral-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" + integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== + +async-each@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" + integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== async-limiter@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" +async@^2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" + integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== + dependencies: + lodash "^4.17.14" asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= atob-lite@^2.0.0: version "2.0.0" @@ -1977,22 +2060,23 @@ atob-lite@^2.0.0: integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY= atob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a" + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== author-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450" integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA= -auto@^7.4.1: - version "7.4.1" - resolved "https://registry.yarnpkg.com/auto/-/auto-7.4.1.tgz#40783be2023f81010fe894c1a35ab24260d42382" - integrity sha512-1/Xzdm94hg6PAq0Efbde8NtJG0IgWkSs12VHZYbt8uzXytyLHt205xJSx3JJ/9XuLKJvcEc/j2ZzcAD8VENlmA== +auto@^7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/auto/-/auto-7.6.0.tgz#bb9178e38057e53047cfd0bc0ae2611afe2a09a1" + integrity sha512-nFSl3sPUKob5o/5M3gs/jP+PiYfedwlQPnP77opeQInVKeRNhDSdogXq2hLtl3lbkEwxAcQ2vgikfyJJnQ1IBQ== dependencies: - "@auto-it/core" "^7.4.1" - "@auto-it/npm" "^7.4.1" - "@auto-it/released" "^7.4.1" + "@auto-it/core" "^7.6.0" + "@auto-it/npm" "^7.6.0" + "@auto-it/released" "^7.6.0" chalk "^2.4.2" command-line-args "^5.1.1" command-line-usage "^6.0.2" @@ -2007,10 +2091,12 @@ await-to-js@^2.1.1: aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" + integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== babel-code-frame@^6.22.0: version "6.26.0" @@ -2021,37 +2107,48 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-eslint@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220" +babel-eslint@^10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a" + integrity sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA== dependencies: "@babel/code-frame" "^7.0.0" "@babel/parser" "^7.0.0" "@babel/traverse" "^7.0.0" "@babel/types" "^7.0.0" - eslint-scope "3.7.1" eslint-visitor-keys "^1.0.0" + resolve "^1.12.0" -babel-plugin-add-module-exports@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.0.tgz#72b5424d941a336c6a35357f373d8b8366263031" +babel-plugin-add-module-exports@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-1.0.2.tgz#96cd610d089af664f016467fc4567c099cce2d9c" + integrity sha512-4paN7RivvU3Rzju1vGSHWPjO8Y0rI6droWvSFKI6dvEQ4mvoV0zGojnlzVRfI6N8zISo6VERXt3coIuVmzuvNg== optionalDependencies: chokidar "^2.0.4" -babel-plugin-istanbul@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.0.1.tgz#2ce7bf211f0d9480ff7fd294bd05e2fa555e31ea" +babel-plugin-dynamic-import-node@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== + dependencies: + object.assign "^4.1.0" + +babel-plugin-istanbul@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz#df4ade83d897a92df069c4d9a25cf2671293c854" + integrity sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw== dependencies: + "@babel/helper-plugin-utils" "^7.0.0" find-up "^3.0.0" - istanbul-lib-instrument "^2.2.0" - test-exclude "^5.0.0" + istanbul-lib-instrument "^3.3.0" + test-exclude "^5.2.3" -babel-plugin-source-map-support@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/babel-plugin-source-map-support/-/babel-plugin-source-map-support-2.0.1.tgz#ccd822535ab32cf73c0a50596ed87e534ffdf410" +babel-plugin-source-map-support@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-source-map-support/-/babel-plugin-source-map-support-2.1.1.tgz#9cd9b21429fb5dbf10670817050789c644d4c31d" + integrity sha512-Ce0r4iXS/1JX8gjzZcfzw17Pooh7zIkbLFTljuhWPTneNWQ9RauomiutInvz5kmd8tYrZ9axgGq9dm0hml2+Lg== dependencies: - "@babel/core" "^7.0.0-beta.40" - "@babel/helper-module-imports" "^7.0.0-beta.40" + "@babel/helper-module-imports" "^7.0.0" babel-plugin-transform-inline-environment-variables@^0.4.3: version "0.4.3" @@ -2064,26 +2161,32 @@ babelify@^10.0.0: backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" + integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= base64-arraybuffer@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" + integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= base64-js@^1.0.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" + version "1.3.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" + integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== base64id@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6" + integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY= base@^0.11.1: version "0.11.2" resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== dependencies: cache-base "^1.0.1" class-utils "^0.3.5" @@ -2096,14 +2199,10 @@ base@^0.11.1: bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= dependencies: tweetnacl "^0.14.3" -before-after-hook@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.4.0.tgz#2b6bf23dca4f32e628fd2747c10a37c74a4b484d" - integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg== - before-after-hook@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" @@ -2112,31 +2211,29 @@ before-after-hook@^2.0.0: better-assert@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" + integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI= dependencies: callsite "1.0.0" binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" + version "1.13.1" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" + integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== -blob@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" +binary-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" + integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== -bluebird@^3.3.0, bluebird@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" +blob@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" + integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== -bluebird@^3.5.3: - version "3.5.4" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714" - integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw== +bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: + version "3.5.5" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f" + integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w== bmp-js@^0.1.0: version "0.1.0" @@ -2145,36 +2242,23 @@ bmp-js@^0.1.0: bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" + integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== -body-parser@1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.1" - http-errors "~1.6.2" - iconv-lite "0.4.19" - on-finished "~2.3.0" - qs "6.5.1" - raw-body "2.3.2" - type-is "~1.6.15" - -body-parser@^1.16.1: - version "1.18.3" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" +body-parser@1.19.0, body-parser@^1.16.1: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== dependencies: - bytes "3.0.0" + bytes "3.1.0" content-type "~1.0.4" debug "2.6.9" depd "~1.1.2" - http-errors "~1.6.3" - iconv-lite "0.4.23" + http-errors "1.7.2" + iconv-lite "0.4.24" on-finished "~2.3.0" - qs "6.5.2" - raw-body "2.3.3" - type-is "~1.6.16" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" bottleneck@^2.15.3: version "2.19.5" @@ -2184,6 +2268,7 @@ bottleneck@^2.15.3: boxen@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" + integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw== dependencies: ansi-align "^2.0.0" camelcase "^4.0.0" @@ -2196,27 +2281,15 @@ boxen@^1.2.1: brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^0.1.2: - version "0.1.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6" - dependencies: - expand-range "^0.1.0" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.0, braces@^2.3.1: +braces@^2.3.1, braces@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== dependencies: arr-flatten "^1.1.0" array-unique "^0.3.2" @@ -2229,13 +2302,22 @@ braces@^2.3.0, braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" +braces@^3.0.1, braces@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= browser-pack@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774" + integrity sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA== dependencies: JSONStream "^1.0.3" combine-source-map "~0.8.0" @@ -2247,16 +2329,19 @@ browser-pack@^6.0.1: browser-resolve@^1.11.0, browser-resolve@^1.7.0: version "1.11.3" resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" + integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ== dependencies: resolve "1.1.7" browser-stdout@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== browserify-aes@^1.0.0, browserify-aes@^1.0.4: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" + integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== dependencies: buffer-xor "^1.0.3" cipher-base "^1.0.0" @@ -2268,6 +2353,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4: browserify-cipher@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" + integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== dependencies: browserify-aes "^1.0.4" browserify-des "^1.0.0" @@ -2276,6 +2362,7 @@ browserify-cipher@^1.0.0: browserify-des@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" + integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== dependencies: cipher-base "^1.0.1" des.js "^1.0.0" @@ -2285,6 +2372,7 @@ browserify-des@^1.0.0: browserify-rsa@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" + integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= dependencies: bn.js "^4.1.0" randombytes "^2.0.1" @@ -2292,6 +2380,7 @@ browserify-rsa@^4.0.0: browserify-sign@^4.0.0: version "4.0.4" resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" + integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg= dependencies: bn.js "^4.1.1" browserify-rsa "^4.0.0" @@ -2304,12 +2393,14 @@ browserify-sign@^4.0.0: browserify-zlib@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" + integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== dependencies: pako "~1.0.5" -browserify@^16.1.0, browserify@^16.2.2: - version "16.2.2" - resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.2.tgz#4b1f66ba0e54fa39dbc5aa4be9629142143d91b0" +browserify@^16.1.0, browserify@^16.5.0: + version "16.5.0" + resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.5.0.tgz#a1c2bc0431bec11fd29151941582e3f645ede881" + integrity sha512-6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw== dependencies: JSONStream "^1.0.3" assert "^1.4.0" @@ -2348,7 +2439,7 @@ browserify@^16.1.0, browserify@^16.2.2: shasum "^1.0.0" shell-quote "^1.6.1" stream-browserify "^2.0.0" - stream-http "^2.0.0" + stream-http "^3.0.0" string_decoder "^1.1.1" subarg "^1.0.0" syntax-error "^1.1.1" @@ -2360,13 +2451,14 @@ browserify@^16.1.0, browserify@^16.2.2: vm-browserify "^1.0.0" xtend "^4.0.0" -browserslist@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.0.tgz#81cbb8e52dfa09918f93c6e051d779cb7360785d" +browserslist@^4.6.0, browserslist@^4.6.6: + version "4.7.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz#9ee89225ffc07db03409f2fee524dc8227458a17" + integrity sha512-9rGNDtnj+HaahxiVV38Gn8n8Lr8REKsel68v1sPFfIGEK6uSXTY3h9acgiT1dZVtOOUtifo/Dn8daDQ5dUgVsA== dependencies: - caniuse-lite "^1.0.30000878" - electron-to-chromium "^1.3.61" - node-releases "^1.0.0-alpha.11" + caniuse-lite "^1.0.30000989" + electron-to-chromium "^1.3.247" + node-releases "^1.1.29" btoa-lite@^1.0.0: version "1.0.0" @@ -2376,14 +2468,17 @@ btoa-lite@^1.0.0: buf-compare@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a" + integrity sha1-/vKNqLgROgoNtEMLC2Rntpcws0o= buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== buffer-alloc@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== dependencies: buffer-alloc-unsafe "^1.1.0" buffer-fill "^1.0.0" @@ -2395,85 +2490,100 @@ buffer-equal@0.0.1: buffer-fill@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= -buffer-from@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04" - -buffer-from@^1.1.0: +buffer-from@^1.0.0, buffer-from@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + +buffer@^5.0.2: + version "5.4.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115" + integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A== + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" -buffer@^5.0.2, buffer@^5.2.0: +buffer@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.0.tgz#53cf98241100099e9eeae20ee6d51d21b16e541e" dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" -builtin-modules@^1.0.0, builtin-modules@^1.1.1: +builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" + integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= builtins@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" + integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= byline@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" + integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= -byte-size@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.3.tgz#b7c095efc68eadf82985fccd9a2df43a74fa2ccd" +byte-size@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz#4b651039a5ecd96767e71a3d7ed380e48bed4191" + integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw== -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^11.0.1: - version "11.2.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965" +cacache@^11.3.3: + version "11.3.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" + integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== dependencies: - bluebird "^3.5.1" - chownr "^1.0.1" - figgy-pudding "^3.1.0" - glob "^7.1.2" - graceful-fs "^4.1.11" - lru-cache "^4.1.3" + bluebird "^3.5.5" + chownr "^1.1.1" + figgy-pudding "^3.5.1" + glob "^7.1.4" + graceful-fs "^4.1.15" + lru-cache "^5.1.1" mississippi "^3.0.0" mkdirp "^0.5.1" move-concurrently "^1.0.1" promise-inflight "^1.0.1" - rimraf "^2.6.2" - ssri "^6.0.0" - unique-filename "^1.1.0" + rimraf "^2.6.3" + ssri "^6.0.1" + unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^11.3.2: - version "11.3.2" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa" - integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg== +cacache@^12.0.0, cacache@^12.0.3: + version "12.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" + integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== dependencies: - bluebird "^3.5.3" + bluebird "^3.5.5" chownr "^1.1.1" figgy-pudding "^3.5.1" - glob "^7.1.3" + glob "^7.1.4" graceful-fs "^4.1.15" + infer-owner "^1.0.3" lru-cache "^5.1.1" mississippi "^3.0.0" mkdirp "^0.5.1" move-concurrently "^1.0.1" promise-inflight "^1.0.1" - rimraf "^2.6.2" + rimraf "^2.6.3" ssri "^6.0.1" unique-filename "^1.1.1" y18n "^4.0.0" @@ -2481,6 +2591,7 @@ cacache@^11.3.2: cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== dependencies: collection-visit "^1.0.0" component-emitter "^1.2.1" @@ -2492,22 +2603,25 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -cached-path-relative@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7" +cached-path-relative@^1.0.0, cached-path-relative@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db" + integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg== -caching-transform@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-2.0.0.tgz#e1292bd92d35b6e8b1ed7075726724b3bd64eea0" +caching-transform@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/caching-transform/-/caching-transform-3.0.2.tgz#601d46b91eca87687a281e71cef99791b0efca70" + integrity sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w== dependencies: - make-dir "^1.0.0" - md5-hex "^2.0.0" - package-hash "^2.0.0" - write-file-atomic "^2.0.0" + hasha "^3.0.0" + make-dir "^2.0.0" + package-hash "^3.0.0" + write-file-atomic "^2.4.2" call-me-maybe@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" + integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= caller-callsite@^2.0.0: version "2.0.0" @@ -2516,12 +2630,6 @@ caller-callsite@^2.0.0: dependencies: callsites "^2.0.0" -caller-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" - dependencies: - callsites "^0.2.0" - caller-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" @@ -2532,19 +2640,22 @@ caller-path@^2.0.0: callsite@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" - -callsites@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" + integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA= callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -2552,50 +2663,46 @@ camelcase-keys@^2.0.0: camelcase-keys@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" + integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= dependencies: camelcase "^4.1.0" map-obj "^2.0.0" quick-lru "^1.0.0" -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= camelcase@^4.0.0, camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" + integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30000878: - version "1.0.30000880" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000880.tgz#b7b6ceaf739e17d0dda0d89426cba4be16d07bb0" +caniuse-lite@^1.0.30000989: + version "1.0.30000989" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9" + integrity sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw== capture-stack-trace@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" + version "1.0.1" + resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" + integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -2603,15 +2710,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^2.3.2, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2623,76 +2722,68 @@ chalk@^2.3.2, chalk@^2.4.2: chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" + integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -chokidar@^1.0.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^2.0.3, chokidar@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26" +chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.8: + version "2.1.8" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" + integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== dependencies: anymatch "^2.0.0" - async-each "^1.0.0" - braces "^2.3.0" + async-each "^1.0.1" + braces "^2.3.2" glob-parent "^3.1.0" - inherits "^2.0.1" + inherits "^2.0.3" is-binary-path "^1.0.0" is-glob "^4.0.0" - lodash.debounce "^4.0.8" - normalize-path "^2.1.1" + normalize-path "^3.0.0" path-is-absolute "^1.0.0" - readdirp "^2.0.0" - upath "^1.0.5" + readdirp "^2.2.1" + upath "^1.1.1" optionalDependencies: - fsevents "^1.2.2" + fsevents "^1.2.7" -chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - -chownr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494" - integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g== +chokidar@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.1.1.tgz#27e953f3950336efcc455fd03e240c7299062003" + integrity sha512-df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ== + dependencies: + anymatch "^3.1.0" + braces "^3.0.2" + glob-parent "^5.0.0" + is-binary-path "^2.1.0" + is-glob "^4.0.1" + normalize-path "^3.0.0" + readdirp "^3.1.1" + optionalDependencies: + fsevents "^2.0.6" -ci-info@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2" +chownr@^1.1.1, chownr@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6" + integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A== ci-info@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" + integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-json@^0.3.1: - version "0.3.3" - resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" - -circular-json@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.5.tgz#64182ef359042d37cd8e767fc9de878b1e9447d3" - class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== dependencies: arr-union "^3.1.0" define-property "^0.2.5" @@ -2702,28 +2793,31 @@ class-utils@^0.3.5: clean-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7" + integrity sha1-jffHquUf02h06PjQW5GAvBGj/tc= dependencies: escape-string-regexp "^1.0.5" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-boxes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" + integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM= -cli-cursor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" - dependencies: - restore-cursor "^1.0.1" - -cli-cursor@^2.1.0: +cli-cursor@^2.0.0, cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" + integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= dependencies: restore-cursor "^2.0.0" cli-highlight@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/cli-highlight/-/cli-highlight-1.2.3.tgz#b200f97ed0e43d24633e89de0f489a48bb87d2bf" + integrity sha512-cmc4Y2kJuEpT2KZd9pgWWskpDMMfJu2roIcY1Ya/aIItufF5FKsV/NtA6vvdhSUllR8KJfvQDNmIcskU+MKLDg== dependencies: chalk "^2.3.0" highlight.js "^9.6.0" @@ -2731,13 +2825,10 @@ cli-highlight@^1.2.3: parse5 "^3.0.3" yargs "^10.0.3" -cli-spinners@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" - cli-truncate@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" + integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= dependencies: slice-ansi "0.0.4" string-width "^1.0.1" @@ -2745,91 +2836,91 @@ cli-truncate@^0.2.1: cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" + integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= cliui@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" + integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== dependencies: string-width "^2.1.1" strip-ansi "^4.0.0" wrap-ansi "^2.0.0" +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== + dependencies: + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" + clone@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - -cmd-shim@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb" - dependencies: - graceful-fs "^4.1.2" - mkdirp "~0.5.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= dependencies: map-visit "^1.0.0" object-visit "^1.0.0" color-convert@^1.9.0: - version "1.9.2" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147" + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== dependencies: - color-name "1.1.1" + color-name "1.1.3" -color-name@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689" +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= colors@^1.1.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.1.tgz#4accdb89cf2cabc7f982771925e9468784f32f3d" + version "1.3.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d" + integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg== columnify@^1.5.4: version "1.5.4" resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb" + integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs= dependencies: strip-ansi "^3.0.0" wcwidth "^1.0.0" -combine-lists@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6" - dependencies: - lodash "^4.5.0" - combine-source-map@^0.8.0, combine-source-map@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" + integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos= dependencies: convert-source-map "~1.1.0" inline-source-map "~0.6.0" lodash.memoize "~3.0.3" source-map "~0.5.3" -combined-stream@1.0.6, combined-stream@~1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== dependencies: delayed-stream "~1.0.0" +command-exists@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291" + integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw== + command-line-args@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a" @@ -2850,30 +2941,20 @@ command-line-usage@^6.0.2: table-layout "^1.0.0" typical "^5.1.0" -commander@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - -commander@^2.12.1, commander@~2.20.0: +commander@^2.12.1, commander@^2.20.0, commander@^2.8.1, commander@~2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== -commander@^2.14.1, commander@^2.8.1, commander@^2.9.0: - version "2.16.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50" - -commander@~2.17.1: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compare-func@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" + integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg= dependencies: array-ify "^1.0.0" dot-prop "^3.0.0" @@ -2881,22 +2962,32 @@ compare-func@^1.3.1: component-bind@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" + integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= -component-emitter@1.2.1, component-emitter@^1.2.1: +component-emitter@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" + integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== component-inherit@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" + integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== dependencies: buffer-from "^1.0.0" inherits "^2.0.3" @@ -2914,8 +3005,9 @@ concat-stream@^2.0.0: typedarray "^0.0.6" config-chain@^1.1.11: - version "1.1.11" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" + version "1.1.12" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" + integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== dependencies: ini "^1.3.4" proto-list "~1.2.1" @@ -2923,6 +3015,7 @@ config-chain@^1.1.11: configstore@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" + integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw== dependencies: dot-prop "^4.1.0" graceful-fs "^4.1.2" @@ -2932,39 +3025,48 @@ configstore@^3.0.0: xdg-basedir "^3.0.0" connect@^3.6.0: - version "3.6.6" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524" + version "3.7.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" + integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== dependencies: debug "2.6.9" - finalhandler "1.1.0" - parseurl "~1.3.2" + finalhandler "1.1.2" + parseurl "~1.3.3" utils-merge "1.0.1" console-browserify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" + integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= dependencies: date-now "^0.1.4" console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= constants-browserify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= contains-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" + integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" +content-disposition@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== + dependencies: + safe-buffer "5.1.2" content-type@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== conventional-changelog-angular@^5.0.3: version "5.0.3" @@ -2975,17 +3077,17 @@ conventional-changelog-angular@^5.0.3: q "^1.5.1" conventional-changelog-core@^3.1.6: - version "3.2.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0" - integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g== + version "3.2.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz#b31410856f431c847086a7dcb4d2ca184a7d88fb" + integrity sha512-LMMX1JlxPIq/Ez5aYAYS5CpuwbOk6QFp8O4HLAcZxe3vxoCtABkhfjetk8IYdRB9CDQGwJFLR3Dr55Za6XKgUQ== dependencies: - conventional-changelog-writer "^4.0.5" - conventional-commits-parser "^3.0.2" + conventional-changelog-writer "^4.0.6" + conventional-commits-parser "^3.0.3" dateformat "^3.0.0" get-pkg-repo "^1.0.0" git-raw-commits "2.0.0" git-remote-origin-url "^2.0.0" - git-semver-tags "^2.0.2" + git-semver-tags "^2.0.3" lodash "^4.2.1" normalize-package-data "^2.3.5" q "^1.5.1" @@ -2994,23 +3096,23 @@ conventional-changelog-core@^3.1.6: through2 "^3.0.0" conventional-changelog-preset-loader@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4" - integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.2.0.tgz#571e2b3d7b53d65587bea9eedf6e37faa5db4fcc" + integrity sha512-zXB+5vF7D5Y3Cb/rJfSyCCvFphCVmF8mFqOdncX3BmjZwAtGAPfYrBcT225udilCKvBbHgyzgxqz2GWDB5xShQ== -conventional-changelog-writer@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.5.tgz#fb9e384bb294e8e8a9f2568a3f4d1e11953d8641" - integrity sha512-g/Myp4MaJ1A+f7Ai+SnVhkcWtaHk6flw0SYN7A+vQ+MTu0+gSovQWs4Pg4NtcNUcIztYQ9YHsoxHP+GGQplI7Q== +conventional-changelog-writer@^4.0.6: + version "4.0.7" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.7.tgz#e4b7d9cbea902394ad671f67108a71fa90c7095f" + integrity sha512-p/wzs9eYaxhFbrmX/mCJNwJuvvHR+j4Fd0SQa2xyAhYed6KBiZ780LvoqUUvsayP4R1DtC27czalGUhKV2oabw== dependencies: compare-func "^1.3.1" conventional-commits-filter "^2.0.2" dateformat "^3.0.0" - handlebars "^4.1.0" + handlebars "^4.1.2" json-stringify-safe "^5.0.1" lodash "^4.2.1" meow "^4.0.0" - semver "^5.5.0" + semver "^6.0.0" split "^1.0.0" through2 "^3.0.0" @@ -3022,52 +3124,64 @@ conventional-commits-filter@^2.0.2: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-parser@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.2.tgz#1295590dd195f64f53d6f8eb7c41114bb9a60742" - integrity sha512-y5eqgaKR0F6xsBNVSQ/5cI5qIF3MojddSUi1vKIggRkqUTbkqFKH9P5YX/AT1BVZp9DtSzBTIkvjyVLotLsVog== +conventional-commits-parser@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d" + integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg== dependencies: JSONStream "^1.0.4" - is-text-path "^1.0.0" + is-text-path "^2.0.0" lodash "^4.2.1" meow "^4.0.0" split2 "^2.0.0" through2 "^3.0.0" trim-off-newlines "^1.0.0" -conventional-recommended-bump@^4.0.4: - version "4.1.1" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-4.1.1.tgz#37014fadeda267d0607e2fc81124da840a585127" - integrity sha512-JT2vKfSP9kR18RXXf55BRY1O3AHG8FPg5btP3l7LYfcWJsiXI6MCf30DepQ98E8Qhowvgv7a8iev0J1bEDkTFA== +conventional-recommended-bump@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz#5af63903947b6e089e77767601cb592cabb106ba" + integrity sha512-RVdt0elRcCxL90IrNP0fYCpq1uGt2MALko0eyeQ+zQuDVWtMGAy9ng6yYn3kax42lCj9+XBxQ8ZN6S9bdKxDhQ== dependencies: concat-stream "^2.0.0" conventional-changelog-preset-loader "^2.1.1" conventional-commits-filter "^2.0.2" - conventional-commits-parser "^3.0.2" + conventional-commits-parser "^3.0.3" git-raw-commits "2.0.0" - git-semver-tags "^2.0.2" + git-semver-tags "^2.0.3" meow "^4.0.0" q "^1.5.1" -convert-source-map@^1.1.0, convert-source-map@^1.1.3, convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" +convert-source-map@^1.1.0, convert-source-map@^1.1.3, convert-source-map@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" + integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A== + dependencies: + safe-buffer "~5.1.1" convert-source-map@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" + integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA= cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" + integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" + integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== dependencies: aproba "^1.1.1" fs-write-stream-atomic "^1.0.8" @@ -3079,28 +3193,49 @@ copy-concurrently@^1.0.0: copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-assert@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/core-assert/-/core-assert-0.2.1.tgz#f85e2cf9bfed28f773cc8b3fa5c5b69bdc02fe3f" + integrity sha1-+F4s+b/tKPdzzIs/pcW2m9wC/j8= dependencies: buf-compare "^1.0.0" is-error "^2.2.0" +core-js-compat@^3.1.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz#0cbdbc2e386e8e00d3b85dc81c848effec5b8150" + integrity sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A== + dependencies: + browserslist "^4.6.6" + semver "^6.3.0" + core-js@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" integrity sha1-TekR5mew6ukSTjQlS1OupvxhjT4= -core-js@^2.0.0, core-js@^2.2.0, core-js@^2.5.7: +core-js@^2.0.0: + version "2.6.9" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" + integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== + +core-js@^2.5.7: version "2.5.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" +core-js@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" + integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@5.2.1: +cosmiconfig@5.2.1, cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== @@ -3110,35 +3245,21 @@ cosmiconfig@5.2.1: js-yaml "^3.13.1" parse-json "^4.0.0" -cosmiconfig@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0" - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^4.0.0" - -cosmiconfig@^5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39" - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^4.0.0" - -cosmiconfig@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8" - integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g== +cp-file@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" + integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA== dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.0" - parse-json "^4.0.0" + graceful-fs "^4.1.2" + make-dir "^2.0.0" + nested-error-stacks "^2.0.0" + pify "^4.0.1" + safe-buffer "^5.0.1" create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" + integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== dependencies: bn.js "^4.1.0" elliptic "^6.0.0" @@ -3146,12 +3267,14 @@ create-ecdh@^4.0.0: create-error-class@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" + integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= dependencies: capture-stack-trace "^1.0.0" create-hash@^1.1.0, create-hash@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" + integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== dependencies: cipher-base "^1.0.1" inherits "^2.0.1" @@ -3162,6 +3285,7 @@ create-hash@^1.1.0, create-hash@^1.1.2: create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: version "1.1.7" resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" + integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== dependencies: cipher-base "^1.0.3" create-hash "^1.1.0" @@ -3170,16 +3294,17 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-env@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" +cross-env@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.0.tgz#3c8e71440ea20aa6faaf5aec541235efc565dac6" + integrity sha512-G/B6gtkjgthT8AP/xN1wdj5Xe18fVyk58JepK8GxpUbqcz3hyWxegocMbvnZK+KoTslwd0ACZ3woi/DVUdVjyQ== dependencies: - cross-spawn "^6.0.5" - is-windows "^1.0.0" + cross-spawn "^7.0.0" cross-spawn@^4: version "4.0.2" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" + integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE= dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -3187,6 +3312,7 @@ cross-spawn@^4: cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" + integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= dependencies: lru-cache "^4.0.1" shebang-command "^1.2.0" @@ -3195,6 +3321,7 @@ cross-spawn@^5.0.1: cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== dependencies: nice-try "^1.0.4" path-key "^2.0.1" @@ -3202,9 +3329,19 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" +cross-spawn@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.0.tgz#21ef9470443262f33dba80b2705a91db959b2e03" + integrity sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw== + dependencies: + path-key "^3.1.0" + shebang-command "^1.2.0" + which "^1.2.9" + crypto-browserify@^3.0.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" + integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== dependencies: browserify-cipher "^1.0.0" browserify-sign "^4.0.0" @@ -3221,114 +3358,145 @@ crypto-browserify@^3.0.0: crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" + integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= dependencies: array-find-index "^1.0.1" custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" + integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU= -cyclist@~0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" +cyclist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" + integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= dargs@^4.0.1: version "4.1.0" resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17" + integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc= dependencies: number-is-nan "^1.0.0" +dash-ast@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-1.0.0.tgz#12029ba5fb2f8aa6f0a861795b23c1b4b6c27d37" + integrity sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA== + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= dependencies: assert-plus "^1.0.0" date-fns@^1.27.2: - version "1.29.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6" + version "1.30.1" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" + integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== -date-format@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8" +date-format@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf" + integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA== date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" + integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs= dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" + integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug-log@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" - -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@3.1.0, debug@^3.1.0, debug@~3.1.0: +debug@3.1.0, debug@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== dependencies: ms "2.0.0" +debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.2.6: + version "3.2.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" + integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== + dependencies: + ms "^2.1.1" + +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" + integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= decamelize-keys@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" + integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= dependencies: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= decamelize@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7" + integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg== dependencies: xregexp "4.0.0" decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" + integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= deep-extend@^0.6.0, deep-extend@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= deep-strict-equal@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/deep-strict-equal/-/deep-strict-equal-0.2.0.tgz#4a078147a8ab57f6a0d4f5547243cd22f44eb4e4" + integrity sha1-SgeBR6irV/ag1PVUckPNIvROtOQ= dependencies: core-assert "^0.2.0" -deepmerge@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e" - integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow== - -deepmerge@4.0.0, deepmerge@^4.0.0: +deepmerge@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09" integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww== @@ -3336,37 +3504,42 @@ deepmerge@4.0.0, deepmerge@^4.0.0: default-require-extensions@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7" + integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc= dependencies: strip-bom "^3.0.0" defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= dependencies: clone "^1.0.2" -define-properties@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" +define-properties@^1.1.2, define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== dependencies: - foreach "^2.0.5" - object-keys "^1.0.8" + object-keys "^1.0.12" define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= dependencies: is-descriptor "^0.1.0" define-property@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= dependencies: is-descriptor "^1.0.0" define-property@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== dependencies: is-descriptor "^1.0.2" isobject "^3.0.1" @@ -3374,6 +3547,7 @@ define-property@^2.0.2: defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= definitelytyped-header-parser@^1.2.0: version "1.2.0" @@ -3391,38 +3565,34 @@ definitelytyped-header-parser@^3.7.2: "@types/parsimmon" "^1.3.0" parsimmon "^1.2.0" -del@^2.0.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" - dependencies: - globby "^5.0.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - rimraf "^2.2.8" +del@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7" + integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA== + dependencies: + globby "^10.0.1" + graceful-fs "^4.2.2" + is-glob "^4.0.1" + is-path-cwd "^2.2.0" + is-path-inside "^3.0.1" + p-map "^3.0.0" + rimraf "^3.0.0" + slash "^3.0.0" delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" - -depd@~1.1.1, depd@~1.1.2: +depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - -deprecation@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711" - integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg== + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= deprecation@^2.0.0: version "2.3.1" @@ -3432,6 +3602,7 @@ deprecation@^2.0.0: deps-sort@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5" + integrity sha1-CRckkC6EZYJg65EHSMzNGvbiH7U= dependencies: JSONStream "^1.0.3" shasum "^1.0.0" @@ -3441,6 +3612,7 @@ deps-sort@^2.0.0: des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" + integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw= dependencies: inherits "^2.0.1" minimalistic-assert "^1.0.0" @@ -3448,26 +3620,31 @@ des.js@^1.0.0: destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" + integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= detective@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb" + version "5.2.0" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== dependencies: - acorn-node "^1.3.0" + acorn-node "^1.6.1" defined "^1.0.0" minimist "^1.1.1" dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" + integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY= dependencies: asap "^2.0.0" wrappy "1" @@ -3475,6 +3652,7 @@ dezalgo@^1.0.0: di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" + integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= diff@3.5.0, diff@^3.1.0, diff@^3.2.0: version "3.5.0" @@ -3484,34 +3662,45 @@ diff@3.5.0, diff@^3.1.0, diff@^3.2.0: diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" + integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== dependencies: bn.js "^4.1.0" miller-rabin "^4.0.0" randombytes "^2.0.0" -dir-glob@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" +dir-glob@^2.0.0, dir-glob@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" + integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== dependencies: - arrify "^1.0.1" path-type "^3.0.0" +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + doctrine@1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" + integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= dependencies: esutils "^2.0.2" isarray "^1.0.0" -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== dependencies: esutils "^2.0.2" dom-serialize@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" + integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs= dependencies: custom-event "~1.0.0" ent "~2.2.0" @@ -3525,16 +3714,19 @@ dom-walk@^0.1.0: domain-browser@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" + integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== dot-prop@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" + integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc= dependencies: is-obj "^1.0.0" dot-prop@^4.1.0, dot-prop@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" + integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== dependencies: is-obj "^1.0.0" @@ -3548,23 +3740,24 @@ download-file-sync@^1.0.4: resolved "https://registry.yarnpkg.com/download-file-sync/-/download-file-sync-1.0.4.tgz#d3e3c543f836f41039455b9034c72e355b036019" integrity sha1-0+PFQ/g29BA5RVuQNMcuNVsDYBk= -dts-critic@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dts-critic/-/dts-critic-2.0.0.tgz#9d52943326d57df0691aa0479010a73ccb855a4f" - integrity sha512-oYo69B8NcjUoDhKh8oUl58ljMsgyWnPR0Qf3QKJmKjm5LvkQ21v4SW+QCOleI1Cs0HRN6zEYllvQEORGd45wOQ== +dts-critic@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dts-critic/-/dts-critic-2.1.0.tgz#d7a6fcdcec301f639b7700fd9a2c9db4ab7071f4" + integrity sha512-vXfmzBfaC4sBML2Er1YfFbcknyxp9t16x1NF0nTYj20gDR1dCF8aOpu/c+CgySxFyqEyLq6t0FkmWwpZEX6VLQ== dependencies: + command-exists "^1.2.8" definitelytyped-header-parser "^1.2.0" download-file-sync "^1.0.4" semver "^6.2.0" yargs "^12.0.5" -dtslint@^0.9.6: - version "0.9.6" - resolved "https://registry.yarnpkg.com/dtslint/-/dtslint-0.9.6.tgz#ccc564f226de14b3021e457127dd07e447c85b60" - integrity sha512-BIPTSnpYyGJxVcToYnw9KPkw3Er7hhK21E/QIBYWbkKkAa065221f8MVHwePB13TkyLOFCNdQOPICNnrQ+rfoA== +dtslint@^0.9.8: + version "0.9.8" + resolved "https://registry.yarnpkg.com/dtslint/-/dtslint-0.9.8.tgz#c1fdc12c73f57f10528f0b4dda04be5c82919129" + integrity sha512-cxxGo0mQO9mFQcUShtPbmmoZ+PrUczEV6R/PaN06dnv2IbgtIgLyrO8NBeU7VeHMxpe6exESy48oom97LWUIkA== dependencies: definitelytyped-header-parser "^3.7.2" - dts-critic "^2.0.0" + dts-critic "^2.1.0" fs-extra "^6.0.1" request "^2.88.0" strip-json-comments "^2.0.1" @@ -3574,20 +3767,24 @@ dtslint@^0.9.6: duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= dependencies: readable-stream "^2.0.2" duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= duplexify@^3.4.2, duplexify@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410" + version "3.7.1" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" + integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== dependencies: end-of-stream "^1.0.0" inherits "^2.0.1" @@ -3597,6 +3794,7 @@ duplexify@^3.4.2, duplexify@^3.6.0: ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" @@ -3604,18 +3802,22 @@ ecc-jsbn@~0.1.1: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.61: - version "1.3.61" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.61.tgz#a8ac295b28d0f03d85e37326fd16b6b6b17a1795" +electron-to-chromium@^1.3.247: + version "1.3.263" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.263.tgz#089957556c0a3e2a3726217449796914e5fe9609" + integrity sha512-VfPi+sE/1nEKOV7DWDqWSUGP7ztJG5FeqHbMEj6dBb/arKnxpOCnRXOSC6HBV6qTfK5v8CX7xWCqzN36UqG1oA== elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" + integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= elliptic@^6.0.0: - version "6.4.1" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a" + version "6.5.1" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b" + integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg== dependencies: bn.js "^4.4.0" brorand "^1.0.1" @@ -3625,25 +3827,34 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -encodeurl@~1.0.1, encodeurl@~1.0.2: +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= encoding@^0.1.11: version "0.1.12" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" + integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= dependencies: iconv-lite "~0.4.13" end-of-stream@^1.0.0, end-of-stream@^1.1.0: version "1.4.1" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" + integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== dependencies: once "^1.4.0" engine.io-client@~3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36" + integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw== dependencies: component-emitter "1.2.1" component-inherit "0.0.3" @@ -3658,18 +3869,20 @@ engine.io-client@~3.2.0: yeast "0.1.2" engine.io-parser@~2.1.0, engine.io-parser@~2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196" + version "2.1.3" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6" + integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA== dependencies: after "0.8.2" arraybuffer.slice "~0.0.7" base64-arraybuffer "0.1.5" - blob "0.0.4" + blob "0.0.5" has-binary2 "~1.0.2" engine.io@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d" + version "3.2.1" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2" + integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w== dependencies: accepts "~1.3.4" base64id "1.0.0" @@ -3681,19 +3894,21 @@ engine.io@~3.2.0: enhance-visitors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/enhance-visitors/-/enhance-visitors-1.0.0.tgz#aa945d05da465672a1ebd38fee2ed3da8518e95a" + integrity sha1-qpRdBdpGVnKh69OP7i7T2oUY6Vo= dependencies: lodash "^4.13.1" enquirer@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.1.tgz#f1bf52ea38470525f41412d723a62ba6868559c6" - integrity sha512-7slmHsJY+mvnIrzD0Z0FfTFLmVJuIzRNCW72X9s35BshOoC+MI4jLJ8aPyAC/BelAirXBZB+Mu1wSqP0wpW4Kg== + version "2.3.2" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.2.tgz#1c30284907cadff5ed2404bd8396036dd3da070e" + integrity sha512-PLhTMPUXlnaIv9D3Cq3/Zr1xb7soeDDgunobyCmYLUG19n24dvC8i+ZZgm2DekGpDnx7JvFSHV7lxfM58PMtbA== dependencies: ansi-colors "^3.2.1" ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= env-ci@^4.1.1: version "4.1.1" @@ -3706,6 +3921,12 @@ env-ci@^4.1.1: env-editor@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/env-editor/-/env-editor-0.3.1.tgz#30d0540c2101414f258a94d4c0a524c06c13e3c6" + integrity sha1-MNBUDCEBQU8lipTUwKUkwGwT48Y= + +env-paths@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" + integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA= envify@^4.1.0: version "4.1.0" @@ -3717,165 +3938,210 @@ envify@^4.1.0: err-code@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" + integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" -es-abstract@^1.4.3: - version "1.12.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" +es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0: + version "1.14.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.2.tgz#7ce108fad83068c8783c3cdf62e504e084d8c497" + integrity sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg== dependencies: - es-to-primitive "^1.1.1" + es-to-primitive "^1.2.0" function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" + has "^1.0.3" + has-symbols "^1.0.0" + is-callable "^1.1.4" is-regex "^1.0.4" + object-inspect "^1.6.0" + object-keys "^1.1.1" + string.prototype.trimleft "^2.0.0" + string.prototype.trimright "^2.0.0" -es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" +es-to-primitive@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" + integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== dependencies: - is-callable "^1.1.1" + is-callable "^1.1.4" is-date-object "^1.0.1" - is-symbol "^1.0.1" + is-symbol "^1.0.2" es6-error@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== es6-promise@^4.0.3: - version "4.2.4" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" + version "4.2.8" + resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" + integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== es6-promisify@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203" + integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= dependencies: es6-promise "^4.0.3" escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= eslint-ast-utils@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-ast-utils/-/eslint-ast-utils-1.1.0.tgz#3d58ba557801cfb1c941d68131ee9f8c34bd1586" + integrity sha512-otzzTim2/1+lVrlH19EfQQJEhVJSu0zOb9ygb3iapN6UlyaDtyRq4b5U1FuW0v1lRa9Fp/GJyHkSwm6NqABgCA== dependencies: lodash.get "^4.4.2" lodash.zip "^4.2.0" -eslint-config-prettier@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.1.0.tgz#2c26d2cdcfa3a05f0642cd7e6e4ef3316cdabfa2" +eslint-config-prettier@^3.3.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.6.0.tgz#8ca3ffac4bd6eeef623a0651f9d754900e3ec217" + integrity sha512-ixJ4U3uTLXwJts4rmSVW/lMXjlGwCijhBJHk8iVqKKSifeI0qgFEfWl8L63isfc8Od7EiBALF6BX3jKLluf/jQ== + dependencies: + get-stdin "^6.0.0" + +eslint-config-prettier@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.3.0.tgz#e73b48e59dc49d950843f3eb96d519e2248286a3" + integrity sha512-EWaGjlDAZRzVFveh2Jsglcere2KK5CJBhkNSa1xs3KfMUGdRiT7lG089eqPdvlzWHpAqaekubOsOMu8W8Yk71A== dependencies: get-stdin "^6.0.0" -eslint-config-xo@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/eslint-config-xo/-/eslint-config-xo-0.25.0.tgz#8e8bbdee06e3d75b47aeba03fb28d4a43cc8092f" +eslint-config-xo@^0.26.0: + version "0.26.0" + resolved "https://registry.yarnpkg.com/eslint-config-xo/-/eslint-config-xo-0.26.0.tgz#19dcfb1e3038dd440f5c5e4b4d11bb3128801b24" + integrity sha512-l+93kmBSNr5rMrsqwC6xVWsi8LI4He3z6jSk38e9bAkMNsVsQ8XYO+qzXfJFgFX4i/+hiTswyHtl+nDut9rPaA== -eslint-formatter-pretty@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-1.3.0.tgz#985d9e41c1f8475f4a090c5dbd2dfcf2821d607e" +eslint-formatter-pretty@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-2.1.1.tgz#0794a1009195d14e448053fe99667413b7d02e44" + integrity sha512-gWfagucSWBn82WxzwFloBTLAcwYDgnpAfiV5pQfyAV5YpZikuLflRU8nc3Ts9wnNvLhwk4blzb42/C495Yw7BA== dependencies: - ansi-escapes "^2.0.0" + ansi-escapes "^3.1.0" chalk "^2.1.0" + eslint-rule-docs "^1.1.5" log-symbols "^2.0.0" - plur "^2.1.2" + plur "^3.0.1" string-width "^2.0.0" + supports-hyperlinks "^1.0.1" -eslint-import-resolver-node@^0.3.1: +eslint-import-resolver-node@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" + integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== dependencies: debug "^2.6.9" resolve "^1.5.0" -eslint-module-utils@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746" +eslint-module-utils@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz#7b4675875bf96b0dbf1b21977456e5bb1f5e018c" + integrity sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw== dependencies: debug "^2.6.8" - pkg-dir "^1.0.0" + pkg-dir "^2.0.0" eslint-plugin-ava@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-ava/-/eslint-plugin-ava-5.1.0.tgz#885e6bcd1124c08bb8f3ef721600174e25af40a3" + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-ava/-/eslint-plugin-ava-5.1.1.tgz#709a03f6c56f9f316d83ebc739952cc28cea979a" + integrity sha512-3N7geVdXTabpngQOl+ih1ejMbFOXCUYROnTIP66KAQoMcEAkPSXYc/Jwo/qC4zpRR7PXMuf5afMzTEBpyZmWzQ== dependencies: arrify "^1.0.1" deep-strict-equal "^0.2.0" enhance-visitors "^1.0.0" - esm "^3.0.71" + esm "^3.0.82" espree "^4.0.0" - espurify "^1.5.0" + espurify "^1.8.1" import-modules "^1.1.0" is-plain-object "^2.0.4" multimatch "^2.1.0" pkg-up "^2.0.0" eslint-plugin-es@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.3.1.tgz#5acb2565db4434803d1d46a9b4cbc94b345bd028" + version "1.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998" + integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA== + dependencies: + eslint-utils "^1.4.2" + regexpp "^2.0.1" + +eslint-plugin-eslint-comments@^3.0.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz#4ef6c488dbe06aa1627fea107b3e5d059fc8a395" + integrity sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ== dependencies: - eslint-utils "^1.3.0" - regexpp "^2.0.0" + escape-string-regexp "^1.0.5" + ignore "^5.0.5" eslint-plugin-import@^2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" + version "2.18.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" + integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== dependencies: + array-includes "^3.0.3" contains-path "^0.1.0" - debug "^2.6.8" + debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.2.0" - has "^1.0.1" - lodash "^4.17.4" - minimatch "^3.0.3" + eslint-import-resolver-node "^0.3.2" + eslint-module-utils "^2.4.0" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.0" read-pkg-up "^2.0.0" - resolve "^1.6.0" + resolve "^1.11.0" -eslint-plugin-no-use-extend-native@^0.3.12: - version "0.3.12" - resolved "https://registry.yarnpkg.com/eslint-plugin-no-use-extend-native/-/eslint-plugin-no-use-extend-native-0.3.12.tgz#3ad9a00c2df23b5d7f7f6be91550985a4ab701ea" +eslint-plugin-no-use-extend-native@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-no-use-extend-native/-/eslint-plugin-no-use-extend-native-0.4.1.tgz#b2a631219b6a2e91b4370ef6559a754356560a40" + integrity sha512-tDkHM0kvxU0M2TpLRKGfFrpWXctFdTDY7VkiDTLYDaX90hMSJKkr/FiWThEXvKV0Dvffut2Z0B9Y7+h/k6suiA== dependencies: is-get-set-prop "^1.0.0" is-js-type "^2.0.0" is-obj-prop "^1.0.0" - is-proto-prop "^1.0.0" + is-proto-prop "^2.0.0" -eslint-plugin-node@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz#a6e054e50199b2edd85518b89b4e7b323c9f36db" +eslint-plugin-node@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz#55ae3560022863d141fa7a11799532340a685964" + integrity sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w== dependencies: eslint-plugin-es "^1.3.1" eslint-utils "^1.3.1" - ignore "^4.0.2" + ignore "^5.0.2" minimatch "^3.0.4" resolve "^1.8.1" semver "^5.5.0" -eslint-plugin-prettier@^2.6.0, eslint-plugin-prettier@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.2.tgz#71998c60aedfa2141f7bfcbf9d1c459bf98b4fad" +eslint-plugin-prettier@^3.0.0, eslint-plugin-prettier@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz#507b8562410d02a03f0ddc949c616f877852f2ba" + integrity sha512-A+TZuHZ0KU0cnn56/9mfR7/KjUJ9QNVXUhwvRFSR7PGPe0zQR6PTkmyqg1AtUUEOzTqeRsUwyKFh0oVZKVCrtA== dependencies: - fast-diff "^1.1.1" - jest-docblock "^21.0.0" + prettier-linter-helpers "^1.0.0" eslint-plugin-promise@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2" + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" + integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-unicorn@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-6.0.1.tgz#4a97f0bc9449e20b82848dad12094ee2ba72347e" +eslint-plugin-unicorn@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-7.1.0.tgz#9efef5c68fde0ebefb0241fbcfa274f1b959c04e" + integrity sha512-lW/ZwGR638V0XuZgR160qVQvPtw8tw3laKT5LjJPt+W+tN7kVf2S2V7x+ZrEEwSjEb3OiEzb3cppzaKuYtgYeg== dependencies: clean-regexp "^1.0.0" eslint-ast-utils "^1.0.0" @@ -3884,129 +4150,218 @@ eslint-plugin-unicorn@^6.0.1: lodash.kebabcase "^4.0.1" lodash.snakecase "^4.0.1" lodash.upperfirst "^4.2.0" - safe-regex "^1.1.0" + safe-regex "^2.0.1" -eslint-scope@3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" +eslint-rule-docs@^1.1.5: + version "1.1.158" + resolved "https://registry.yarnpkg.com/eslint-rule-docs/-/eslint-rule-docs-1.1.158.tgz#aa85789f11b164ee5f9f8be38aa98456bf20dade" + integrity sha512-S4jQGXR245fsTtJXOwP7JLnXV0Nw+ZvWC1Vo9zILi/5CueV8yKi3Dr2eH4U8MXmBY90oMT32DyAVLymK2ioaog== + +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" +eslint-scope@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" + integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.0, eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" +eslint-utils@^1.3.1, eslint-utils@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" + integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== + dependencies: + eslint-visitor-keys "^1.0.0" -eslint-visitor-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@^5.5.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.6.0.tgz#b6f7806041af01f71b3f1895cbb20971ea4b6223" +eslint@^5.12.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" + integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== dependencies: "@babel/code-frame" "^7.0.0" - ajv "^6.5.3" + ajv "^6.9.1" chalk "^2.1.0" cross-spawn "^6.0.5" - debug "^3.1.0" - doctrine "^2.1.0" - eslint-scope "^4.0.0" + debug "^4.0.1" + doctrine "^3.0.0" + eslint-scope "^4.0.3" eslint-utils "^1.3.1" eslint-visitor-keys "^1.0.0" - espree "^4.0.0" + espree "^5.0.1" esquery "^1.0.1" esutils "^2.0.2" - file-entry-cache "^2.0.0" + file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" glob "^7.1.2" globals "^11.7.0" ignore "^4.0.6" + import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.1.0" - is-resolvable "^1.1.0" - js-yaml "^3.12.0" + inquirer "^6.2.2" + js-yaml "^3.13.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" - lodash "^4.17.5" + lodash "^4.17.11" minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" optionator "^0.8.2" path-is-inside "^1.0.2" - pluralize "^7.0.0" progress "^2.0.0" - regexpp "^2.0.0" - require-uncached "^1.0.3" + regexpp "^2.0.1" semver "^5.5.1" strip-ansi "^4.0.0" strip-json-comments "^2.0.1" - table "^4.0.3" + table "^5.2.3" + text-table "^0.2.0" + +eslint@^6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.4.0.tgz#5aa9227c3fbe921982b2eda94ba0d7fae858611a" + integrity sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA== + dependencies: + "@babel/code-frame" "^7.0.0" + ajv "^6.10.0" + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^4.0.1" + doctrine "^3.0.0" + eslint-scope "^5.0.0" + eslint-utils "^1.4.2" + eslint-visitor-keys "^1.1.0" + espree "^6.1.1" + esquery "^1.0.1" + esutils "^2.0.2" + file-entry-cache "^5.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^11.7.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + inquirer "^6.4.1" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.3.0" + lodash "^4.17.14" + minimatch "^3.0.4" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + optionator "^0.8.2" + progress "^2.0.0" + regexpp "^2.0.1" + semver "^6.1.2" + strip-ansi "^5.2.0" + strip-json-comments "^3.0.1" + table "^5.2.3" text-table "^0.2.0" + v8-compile-cache "^2.0.3" -esm@^3.0.71: - version "3.0.74" - resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.74.tgz#d9b5ac6d6b210068a41337373b002c502c824fbf" +esm@^3.0.82: + version "3.2.25" + resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" + integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== espree@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634" + version "4.1.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f" + integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w== + dependencies: + acorn "^6.0.2" + acorn-jsx "^5.0.0" + eslint-visitor-keys "^1.0.0" + +espree@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" + integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== + dependencies: + acorn "^6.0.7" + acorn-jsx "^5.0.0" + eslint-visitor-keys "^1.0.0" + +espree@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de" + integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ== dependencies: - acorn "^5.6.0" - acorn-jsx "^4.1.1" + acorn "^7.0.0" + acorn-jsx "^5.0.2" + eslint-visitor-keys "^1.1.0" esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -espurify@^1.5.0: +espurify@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/espurify/-/espurify-1.8.1.tgz#5746c6c1ab42d302de10bd1d5bf7f0e8c0515056" + integrity sha512-ZDko6eY/o+D/gHCWyHTU85mKDgYcS4FJj7S+YD6WIInm7GQ6AnOjmcL4+buFV/JOztVLELi/7MmuGU5NHta0Mg== dependencies: core-js "^2.0.0" esquery@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" + integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== dependencies: estraverse "^4.0.0" esrecurse@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" + integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== dependencies: estraverse "^4.1.0" estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -eventemitter3@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" +eventemitter3@^3.1.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" + integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== + +eventemitter3@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" + integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== events@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz#2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5" + integrity sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" + integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== dependencies: md5.js "^1.3.4" safe-buffer "^5.1.1" @@ -4014,6 +4369,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: execa@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" + integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw== dependencies: cross-spawn "^6.0.0" get-stream "^3.0.0" @@ -4026,6 +4382,7 @@ execa@^0.10.0: execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" + integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -4038,6 +4395,7 @@ execa@^0.7.0: execa@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" + integrity sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA== dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -4050,6 +4408,7 @@ execa@^0.9.0: execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== dependencies: cross-spawn "^6.0.0" get-stream "^4.0.0" @@ -4059,31 +4418,29 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e" + integrity sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ== + dependencies: + cross-spawn "^6.0.5" + get-stream "^5.0.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^3.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + exif-parser@^0.1.12: version "0.1.12" resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922" -exit-hook@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" - -expand-braces@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea" - dependencies: - array-slice "^0.2.3" - array-unique "^0.2.1" - braces "^0.1.2" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= dependencies: debug "^2.3.3" define-property "^0.2.5" @@ -4093,63 +4450,53 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expand-range@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044" - dependencies: - is-number "^0.1.1" - repeat-string "^0.2.2" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -express@^4.16.3: - version "4.16.3" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53" +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== dependencies: - accepts "~1.3.5" + accepts "~1.3.7" array-flatten "1.1.1" - body-parser "1.18.2" - content-disposition "0.5.2" + body-parser "1.19.0" + content-disposition "0.5.3" content-type "~1.0.4" - cookie "0.3.1" + cookie "0.4.0" cookie-signature "1.0.6" debug "2.6.9" depd "~1.1.2" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.1.1" + finalhandler "~1.1.2" fresh "0.5.2" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" - parseurl "~1.3.2" + parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.3" - qs "6.5.1" - range-parser "~1.2.0" - safe-buffer "5.1.1" - send "0.16.2" - serve-static "1.13.2" - setprototypeof "1.1.0" - statuses "~1.4.0" - type-is "~1.6.16" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= dependencies: is-extendable "^0.1.0" extend-shallow@^3.0.0, extend-shallow@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= dependencies: assign-symbols "^1.0.0" is-extendable "^1.0.1" @@ -4157,24 +4504,21 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: extend@^3.0.0, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -external-editor@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: chardet "^0.7.0" iconv-lite "^0.4.24" tmp "^0.0.33" -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== dependencies: array-unique "^0.3.2" define-property "^1.0.0" @@ -4188,53 +4532,73 @@ extglob@^2.0.4: extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= extsprintf@^1.2.0: version "1.4.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" + integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= -fast-diff@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154" +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^2.0.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.2.tgz#71723338ac9b4e0e2fff1d6748a2a13d5ed352bf" +fast-glob@^2.2.6: + version "2.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" + integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw== dependencies: "@mrmlnc/readdir-enhanced" "^2.2.1" - "@nodelib/fs.stat" "^1.0.1" + "@nodelib/fs.stat" "^1.1.2" glob-parent "^3.1.0" is-glob "^4.0.0" - merge2 "^1.2.1" + merge2 "^1.2.3" micromatch "^3.1.10" +fast-glob@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602" + integrity sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg== + dependencies: + "@nodelib/fs.stat" "^2.0.1" + "@nodelib/fs.walk" "^1.2.1" + glob-parent "^5.0.0" + is-glob "^4.0.1" + merge2 "^1.2.3" + micromatch "^4.0.2" + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" + integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -figgy-pudding@^3.1.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.4.1.tgz#af66da1991fa2f94ff7f33b545a38ea4b3869696" +fastq@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" + integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA== + dependencies: + reusify "^1.0.0" figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" + integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== figures@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" + integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= dependencies: escape-string-regexp "^1.0.5" object-assign "^4.1.0" @@ -4242,87 +4606,60 @@ figures@^1.7.0: figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" + integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361" +file-entry-cache@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" + integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== dependencies: - flat-cache "^1.2.1" - object-assign "^4.0.1" + flat-cache "^2.0.1" file-type@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18" -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= dependencies: extend-shallow "^2.0.1" is-number "^3.0.0" repeat-string "^1.6.1" to-regex-range "^2.1.0" -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== dependencies: - debug "2.6.9" - encodeurl "~1.0.1" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" - unpipe "~1.0.0" + to-regex-range "^5.0.1" -finalhandler@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" +finalhandler@1.1.2, finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.4.0" + parseurl "~1.3.3" + statuses "~1.5.0" unpipe "~1.0.0" -find-cache-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" - dependencies: - commondir "^1.0.1" - make-dir "^1.0.0" - pkg-dir "^2.0.0" - -find-cache-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d" +find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== dependencies: commondir "^1.0.1" - make-dir "^1.0.0" + make-dir "^2.0.0" pkg-dir "^3.0.0" -find-parent-dir@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" - find-replace@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" @@ -4330,9 +4667,17 @@ find-replace@^3.0.0: dependencies: array-back "^3.0.1" +find-up@3.0.0, find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= dependencies: path-exists "^2.0.0" pinkie-promise "^2.0.0" @@ -4340,36 +4685,53 @@ find-up@^1.0.0: find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= dependencies: locate-path "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat-cache@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" + integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== dependencies: - locate-path "^3.0.0" + flatted "^2.0.0" + rimraf "2.6.3" + write "1.0.3" -flat-cache@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481" +flat@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2" + integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw== dependencies: - circular-json "^0.3.1" - del "^2.0.2" - graceful-fs "^4.1.2" - write "^0.2.1" + is-buffer "~2.0.3" + +flatted@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" + integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== flush-write-stream@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd" + version "1.1.1" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" + integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== dependencies: - inherits "^2.0.1" - readable-stream "^2.0.4" + inherits "^2.0.3" + readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.2.tgz#5a9d80e0165957e5ef0c1210678fc5c4acb9fb03" + version "1.9.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f" + integrity sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A== dependencies: - debug "^3.1.0" + debug "^3.0.0" for-each@^0.3.2: version "0.3.3" @@ -4377,23 +4739,15 @@ for-each@^0.3.2: dependencies: is-callable "^1.1.3" -for-in@^1.0.1, for-in@^1.0.2: +for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= foreground-child@^1.5.6: version "1.5.6" resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9" + integrity sha1-T9ca0t/elnibmApcCilZN8svXOk= dependencies: cross-spawn "^4" signal-exit "^3.0.0" @@ -4401,42 +4755,42 @@ foreground-child@^1.5.6: forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= form-data@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== dependencies: asynckit "^0.4.0" - combined-stream "1.0.6" + combined-stream "^1.0.6" mime-types "^2.1.12" forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" + integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= dependencies: map-cache "^0.2.2" fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= dependencies: inherits "^2.0.1" readable-stream "^2.0.0" -fs-access@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a" - dependencies: - null-check "^1.0.0" - fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" @@ -4446,27 +4800,40 @@ fs-extra@^6.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6" +fs-extra@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== dependencies: - minipass "^2.2.1" + minipass "^2.6.0" fs-readdir-recursive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" + integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== fs-write-stream-atomic@^1.0.8: version "1.0.10" resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" + integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= dependencies: graceful-fs "^4.1.2" iferr "^0.1.5" @@ -4476,34 +4843,35 @@ fs-write-stream-atomic@^1.0.8: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.0.0, fsevents@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" +fsevents@^1.2.7: + version "1.2.9" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" + integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" + nan "^2.12.1" + node-pre-gyp "^0.12.0" -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" +fsevents@^2.0.6: + version "2.0.7" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a" + integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ== function-bind@^1.0.2, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -4522,10 +4890,17 @@ genfun@^5.0.0: get-assigned-identifiers@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz#6dbf411de648cbaf8d9169ebb0d2d576191e2ff1" + integrity sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ== get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" + integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== + +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-monorepo-packages@^1.1.0: version "1.2.0" @@ -4535,13 +4910,15 @@ get-monorepo-packages@^1.1.0: globby "^7.1.1" load-json-file "^4.0.0" -get-own-enumerable-property-symbols@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz#5c4ad87f2834c4b9b4e84549dc1e0650fb38c24b" +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203" + integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg== get-pkg-repo@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d" + integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0= dependencies: hosted-git-info "^2.1.4" meow "^3.3.0" @@ -4549,46 +4926,59 @@ get-pkg-repo@^1.0.0: parse-github-repo-url "^1.3.0" through2 "^2.0.0" -get-port@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" +get-port@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119" + integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw== get-set-props@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-set-props/-/get-set-props-0.1.0.tgz#998475c178445686d0b32246da5df8dbcfbe8ea3" + integrity sha1-mYR1wXhEVobQsyJG2l3428++jqM= get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= get-stdin@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" + integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g== + +get-stdin@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" + integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" + integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= -get-stream@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.0.0.tgz#9e074cb898bd2b9ebabb445a1766d7f43576d977" - dependencies: - pump "^3.0.0" - -get-stream@^4.1.0: +get-stream@^4.0.0, get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== dependencies: pump "^3.0.0" +get-stream@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" + integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + dependencies: + pump "^3.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= dependencies: assert-plus "^1.0.0" @@ -4606,17 +4996,18 @@ git-raw-commits@2.0.0: git-remote-origin-url@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f" + integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8= dependencies: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3" - integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w== +git-semver-tags@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.3.tgz#48988a718acf593800f99622a952a77c405bfa34" + integrity sha512-tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA== dependencies: meow "^4.0.0" - semver "^5.5.0" + semver "^6.0.0" git-up@^4.0.0: version "4.0.1" @@ -4636,6 +5027,7 @@ git-url-parse@^11.1.2: gitconfiglocal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b" + integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s= dependencies: ini "^1.3.2" @@ -4647,33 +5039,30 @@ gitlog@^3.1.2: debug "^3.1.0" lodash.assign "^4.2.0" -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= dependencies: is-glob "^3.1.0" path-dirname "^1.0.0" +glob-parent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954" + integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg== + dependencies: + is-glob "^4.0.1" + glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" + integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" +glob@7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" + integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -4682,10 +5071,10 @@ glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glo once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== +glob@^7.0.0, glob@^7.0.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: + version "7.1.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" + integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -4697,6 +5086,7 @@ glob@^7.1.3: global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU= dependencies: ini "^1.3.4" @@ -4708,19 +5098,23 @@ global@~4.3.0: process "~0.5.1" globals@^11.1.0, globals@^11.7.0: - version "11.7.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673" - -globby@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" - dependencies: - array-union "^1.0.1" - arrify "^1.0.0" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globby@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22" + integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A== + dependencies: + "@types/glob" "^7.1.1" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.0.3" + glob "^7.1.3" + ignore "^5.1.1" + merge2 "^1.2.3" + slash "^3.0.0" globby@^7.1.1: version "7.1.1" @@ -4734,21 +5128,24 @@ globby@^7.1.1: pify "^3.0.0" slash "^1.0.0" -globby@^8.0.0, globby@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" +globby@^9.0.0, globby@^9.2.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" + integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== dependencies: - array-union "^1.0.1" - dir-glob "^2.0.0" - fast-glob "^2.0.2" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" + "@types/glob" "^7.1.1" + array-union "^1.0.2" + dir-glob "^2.2.2" + fast-glob "^2.2.6" + glob "^7.1.3" + ignore "^4.0.3" + pify "^4.0.1" + slash "^2.0.0" got@^6.7.1: version "6.7.1" resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" + integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA= dependencies: create-error-class "^3.0.0" duplexer3 "^0.1.4" @@ -4762,33 +5159,20 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -graceful-fs@^4.1.15: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" + integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== growl@1.10.5: version "1.10.5" resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" + integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -handlebars@^4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" - dependencies: - async "^1.4.0" - optimist "^0.6.1" - source-map "^0.4.4" - optionalDependencies: - uglify-js "^2.6" - -handlebars@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" - integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw== +handlebars@^4.1.2: + version "4.2.1" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.1.tgz#dc69c0e61604224f0c23b38b5b6741db210b57da" + integrity sha512-bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -4799,41 +5183,59 @@ handlebars@^4.1.0: har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29" + version "5.1.3" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" + integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== dependencies: - ajv "^5.3.0" + ajv "^6.5.5" har-schema "^2.0.0" has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= dependencies: ansi-regex "^2.0.0" has-binary2@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" + integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== dependencies: isarray "2.0.1" has-cors@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" + integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + +has-flag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" + integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" + integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= dependencies: get-value "^2.0.3" has-values "^0.1.4" @@ -4842,6 +5244,7 @@ has-value@^0.3.1: has-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= dependencies: get-value "^2.0.6" has-values "^1.0.0" @@ -4850,10 +5253,12 @@ has-value@^1.0.0: has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= has-values@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= dependencies: is-number "^3.0.0" kind-of "^4.0.0" @@ -4861,99 +5266,120 @@ has-values@^1.0.0: has-yarn@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7" + integrity sha1-ieJdtgS3Jcj1l2//Ct3JIbgopac= -has@^1.0.0, has@^1.0.1: +has@^1.0.0, has@^1.0.1, has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" hash-base@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" + integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg= dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.5" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812" + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== dependencies: inherits "^2.0.3" minimalistic-assert "^1.0.1" +hasha@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/hasha/-/hasha-3.0.0.tgz#52a32fab8569d41ca69a61ff1a214f8eb7c8bd39" + integrity sha1-UqMvq4Vp1BymmmH/GiFPjrfIvTk= + dependencies: + is-stream "^1.0.1" + hat@^0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" + integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo= -he@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== highlight.js@^9.6.0: - version "9.12.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" + version "9.15.10" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2" + integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw== hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= dependencies: hash.js "^1.0.3" minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -home-or-tmp@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb" - -hosted-git-info@^2.1.4, hosted-git-info@^2.6.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" +hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: + version "2.8.4" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546" + integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ== htmlescape@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" + integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= http-cache-semantics@^3.8.1: version "3.8.1" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2" + integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== -http-errors@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== dependencies: - depd "1.1.1" + depd "~1.1.2" inherits "2.0.3" - setprototypeof "1.0.3" - statuses ">= 1.3.1 < 2" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" -http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== dependencies: depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" http-proxy-agent@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" + integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== dependencies: agent-base "4" debug "3.1.0" http-proxy@^1.13.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" + version "1.18.0" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a" + integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ== dependencies: - eventemitter3 "^3.0.0" + eventemitter3 "^4.0.0" follow-redirects "^1.0.0" requires-port "^1.0.0" http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" @@ -4962,78 +5388,79 @@ http-signature@~1.2.0: https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" + integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= https-proxy-agent@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0" + version "2.2.2" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793" + integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg== dependencies: - agent-base "^4.1.0" + agent-base "^4.3.0" debug "^3.1.0" humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" + integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= dependencies: ms "^2.0.0" -husky@^1.0.0-rc.15: - version "1.0.0-rc.15" - resolved "https://registry.yarnpkg.com/husky/-/husky-1.0.0-rc.15.tgz#f1545d15c7f34d5db19e40b70df07ac9a362673d" +husky@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/husky/-/husky-3.0.5.tgz#d7db27c346645a8dc52df02aa534a377ad7925e0" + integrity sha512-cKd09Jy9cDyNIvAdN2QQAP/oA21sle4FWXjIMDttailpLAYZuBE7WaPmhrkj+afS8Sj9isghAtFvWSQ0JiwOHg== dependencies: - cosmiconfig "^5.0.6" - execa "^0.9.0" - find-up "^3.0.0" - get-stdin "^6.0.0" - is-ci "^1.2.1" - pkg-dir "^3.0.0" - please-upgrade-node "^3.1.1" - read-pkg "^4.0.1" + chalk "^2.4.2" + cosmiconfig "^5.2.1" + execa "^1.0.0" + get-stdin "^7.0.0" + is-ci "^2.0.0" + opencollective-postinstall "^2.0.2" + pkg-dir "^4.2.0" + please-upgrade-node "^3.2.0" + read-pkg "^5.1.1" run-node "^1.0.0" - slash "^2.0.0" - -iconv-lite@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" - -iconv-lite@0.4.23, iconv-lite@^0.4.4, iconv-lite@~0.4.13: - version "0.4.23" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" - dependencies: - safer-buffer ">= 2.1.2 < 3" + slash "^3.0.0" -iconv-lite@^0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" ieee754@^1.1.4: - version "1.1.12" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b" + version "1.1.13" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" + integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== iferr@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" + integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" + version "3.0.2" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.2.tgz#99d83a246c196ea5c93ef9315ad7b0819c35069b" + integrity sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw== dependencies: minimatch "^3.0.4" ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" + integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== -ignore@^4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.5.tgz#333535a20325ba4852c4ddb135d47392aa035e6d" - -ignore@^4.0.6: +ignore@^4.0.3, ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.0.2, ignore@^5.0.5, ignore@^5.1.1: + version "5.1.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" + integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + import-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" @@ -5049,6 +5476,14 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" +import-fresh@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" + integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966" @@ -5059,58 +5494,80 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -import-local@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc" +import-local@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" + integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== dependencies: - pkg-dir "^2.0.0" + pkg-dir "^3.0.0" resolve-cwd "^2.0.0" import-modules@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-1.1.0.tgz#748db79c5cc42bb9701efab424f894e72600e9dc" + integrity sha1-dI23nFzEK7lwHvq0JPiU5yYA6dw= imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= dependencies: repeating "^2.0.0" -indent-string@^3.0.0: +indent-string@^3.0.0, indent-string@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" + integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" + integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= + +infer-owner@^1.0.3, infer-owner@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" + integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" + integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + +inherits@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" + integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== init-package-json@^1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz#45ffe2f610a8ca134f2bd1db5637b235070f6cbe" + integrity sha512-zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw== dependencies: glob "^7.1.1" npm-package-arg "^4.0.0 || ^5.0.0 || ^6.0.0" @@ -5124,30 +5581,33 @@ init-package-json@^1.10.3: inline-source-map@~0.6.0: version "0.6.2" resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" + integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU= dependencies: source-map "~0.5.3" -inquirer@^6.1.0, inquirer@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8" +inquirer@^6.2.0, inquirer@^6.2.2, inquirer@^6.4.1: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" + ansi-escapes "^3.2.0" + chalk "^2.4.2" cli-cursor "^2.1.0" cli-width "^2.0.0" - external-editor "^3.0.0" + external-editor "^3.0.3" figures "^2.0.0" - lodash "^4.17.10" + lodash "^4.17.12" mute-stream "0.0.7" run-async "^2.2.0" - rxjs "^6.1.0" + rxjs "^6.4.0" string-width "^2.1.0" - strip-ansi "^4.0.0" + strip-ansi "^5.1.0" through "^2.3.6" insert-module-globals@^7.0.0: version "7.2.0" resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.0.tgz#ec87e5b42728479e327bd5c5c71611ddfb4752ba" + integrity sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw== dependencies: JSONStream "^1.0.3" acorn-node "^1.5.2" @@ -5160,99 +5620,123 @@ insert-module-globals@^7.0.0: undeclared-identifiers "^1.1.2" xtend "^4.0.0" -invariant@^2.2.0, invariant@^2.2.2: +invariant@^2.2.2: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== dependencies: loose-envify "^1.0.0" invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" + integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= -ipaddr.js@1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" +ipaddr.js@1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" + integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== -irregular-plurals@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766" +irregular-plurals@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-2.0.0.tgz#39d40f05b00f656d0b7fa471230dd3b714af2872" + integrity sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw== is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= dependencies: kind-of "^3.0.2" is-accessor-descriptor@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== dependencies: kind-of "^6.0.0" is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= dependencies: binary-extensions "^1.0.0" +is-binary-path@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-buffer@^1.1.0, is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" +is-buffer@~2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" + integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== -is-callable@^1.1.1, is-callable@^1.1.3: +is-callable@^1.1.3, is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" + integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== is-ci@^1.0.10: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5" - dependencies: - ci-info "^1.0.0" - -is-ci@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c" + integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg== dependencies: ci-info "^1.5.0" +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= dependencies: kind-of "^3.0.2" is-data-descriptor@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== dependencies: kind-of "^6.0.0" is-date-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" + integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== dependencies: is-accessor-descriptor "^0.1.6" is-data-descriptor "^0.1.4" @@ -5261,6 +5745,7 @@ is-descriptor@^0.1.0: is-descriptor@^1.0.0, is-descriptor@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== dependencies: is-accessor-descriptor "^1.0.0" is-data-descriptor "^1.0.0" @@ -5269,54 +5754,48 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-directory@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" + integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-error@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-error/-/is-error-2.2.1.tgz#684a96d84076577c98f4cdb40c6d26a5123bf19c" + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-error/-/is-error-2.2.2.tgz#c10ade187b3c93510c5470a5567833ee25649843" + integrity sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= is-extendable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== dependencies: is-plain-object "^2.0.4" -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" + integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= dependencies: number-is-nan "^1.0.0" is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= dependencies: number-is-nan "^1.0.0" is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= is-function@^1.0.1: version "1.0.1" @@ -5325,31 +5804,29 @@ is-function@^1.0.1: is-get-set-prop@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-get-set-prop/-/is-get-set-prop-1.0.0.tgz#2731877e4d78a6a69edcce6bb9d68b0779e76312" + integrity sha1-JzGHfk14pqae3M5rudaLB3nnYxI= dependencies: get-set-props "^0.1.0" lowercase-keys "^1.0.0" -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" + integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" +is-glob@^4.0.0, is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" is-installed-globally@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" + integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA= dependencies: global-dirs "^0.1.0" is-path-inside "^1.0.0" @@ -5357,36 +5834,31 @@ is-installed-globally@^0.1.0: is-js-type@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-js-type/-/is-js-type-2.0.0.tgz#73617006d659b4eb4729bba747d28782df0f7e22" + integrity sha1-c2FwBtZZtOtHKbunR9KHgt8PfiI= dependencies: js-types "^1.0.0" is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - -is-number@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" + integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= dependencies: kind-of "^3.0.2" -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== is-obj-prop@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-obj-prop/-/is-obj-prop-1.0.0.tgz#b34de79c450b8d7c73ab2cdf67dc875adb85f80e" + integrity sha1-s03nnEULjXxzqyzfZ9yHWtuF+A4= dependencies: lowercase-keys "^1.0.0" obj-props "^1.0.0" @@ -5394,36 +5866,41 @@ is-obj-prop@^1.0.0: is-obj@^1.0.0, is-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-observable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" + integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA== dependencies: symbol-observable "^1.1.0" -is-path-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" - -is-path-in-cwd@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" - dependencies: - is-path-inside "^1.0.0" +is-path-cwd@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" + integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== is-path-inside@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" + integrity sha1-jvW33lBDej/cprToZe96pVy0gDY= dependencies: path-is-inside "^1.0.1" +is-path-inside@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.1.tgz#7417049ed551d053ab82bba3fdd6baa6b3a81e89" + integrity sha512-CKstxrctq1kUesU6WhtZDbYKzzYBuRH0UYInAVrkc/EYdB9ltbfE0gOoayG9nhohG6447sOOVGhHqsdmBvkbNg== + is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== dependencies: isobject "^3.0.1" @@ -5434,46 +5911,40 @@ is-plain-object@^3.0.0: dependencies: isobject "^4.0.0" -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" + integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-proto-prop@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-proto-prop/-/is-proto-prop-1.0.1.tgz#c8a0455c28fe38c8843d0c22af6f95f01ed4abc4" +is-proto-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-proto-prop/-/is-proto-prop-2.0.0.tgz#99ab2863462e44090fd083efd1929058f9d935e1" + integrity sha512-jl3NbQ/fGLv5Jhan4uX+Ge9ohnemqyblWVVCpAvtTQzNFvV2xhJq+esnkIbYQ9F1nITXoLfDDQLp7LBw/zzncg== dependencies: lowercase-keys "^1.0.0" - proto-props "^1.1.0" + proto-props "^2.0.0" is-redirect@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" + integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= is-regex@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" + integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= dependencies: has "^1.0.1" is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - -is-resolvable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= is-retry-allowed@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" + integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== is-ssh@^1.3.0: version "1.3.1" @@ -5482,67 +5953,88 @@ is-ssh@^1.3.0: dependencies: protocols "^1.1.0" -is-stream@^1.0.0, is-stream@^1.1.0: +is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= -is-symbol@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-text-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" +is-symbol@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" + integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== + dependencies: + has-symbols "^1.0.0" + +is-text-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636" + integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw== dependencies: - text-extensions "^1.0.0" + text-extensions "^2.0.0" is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= is-windows@^1.0.0, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= + +is-wsl@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.0.tgz#94369bbeb2249ef07b831b1b08590e686330ccbb" + integrity sha512-pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ== isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isarray@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" - -isarray@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7" + integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= isbinaryfile@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== dependencies: buffer-alloc "^1.2.0" isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= dependencies: isarray "1.0.0" isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= isobject@^4.0.0: version "4.0.0" @@ -5552,107 +6044,95 @@ isobject@^4.0.0: isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= -istanbul-lib-coverage@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda" +istanbul-lib-coverage@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49" + integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA== -istanbul-lib-hook@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72" +istanbul-lib-hook@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz#c95695f383d4f8f60df1f04252a9550e15b5b133" + integrity sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA== dependencies: append-transform "^1.0.0" -istanbul-lib-instrument@^2.2.0, istanbul-lib-instrument@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.2.tgz#b287cbae2b5f65f3567b05e2e29b275eaf92d25e" - dependencies: - "@babel/generator" "7.0.0-beta.51" - "@babel/parser" "7.0.0-beta.51" - "@babel/template" "7.0.0-beta.51" - "@babel/traverse" "7.0.0-beta.51" - "@babel/types" "7.0.0-beta.51" - istanbul-lib-coverage "^2.0.1" - semver "^5.5.0" +istanbul-lib-instrument@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630" + integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA== + dependencies: + "@babel/generator" "^7.4.0" + "@babel/parser" "^7.4.3" + "@babel/template" "^7.4.0" + "@babel/traverse" "^7.4.3" + "@babel/types" "^7.4.0" + istanbul-lib-coverage "^2.0.5" + semver "^6.0.0" -istanbul-lib-report@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.1.tgz#64a0a08f42676b9c801b841b9dc3311017c6ae09" +istanbul-lib-report@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33" + integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ== dependencies: - istanbul-lib-coverage "^2.0.1" - make-dir "^1.3.0" - supports-color "^5.4.0" + istanbul-lib-coverage "^2.0.5" + make-dir "^2.1.0" + supports-color "^6.1.0" -istanbul-lib-source-maps@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e" +istanbul-lib-source-maps@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8" + integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw== dependencies: - debug "^3.1.0" - istanbul-lib-coverage "^2.0.1" - make-dir "^1.3.0" - rimraf "^2.6.2" + debug "^4.1.1" + istanbul-lib-coverage "^2.0.5" + make-dir "^2.1.0" + rimraf "^2.6.3" source-map "^0.6.1" -istanbul-reports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.0.tgz#eb12eddf55724ebc557b32cd77c34d11ed7980c1" +istanbul-reports@^2.2.4: + version "2.2.6" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af" + integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA== dependencies: - handlebars "^4.0.11" + handlebars "^4.1.2" java-properties@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211" integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ== -jest-docblock@^21.0.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414" - -jest-get-type@^22.1.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" - -jest-validate@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.5.0.tgz#f5df8f761cf43155e1b2e21d6e9de8a2852d0231" - dependencies: - chalk "^2.0.1" - jest-get-type "^22.1.0" - leven "^2.1.0" - pretty-format "^23.5.0" - jpeg-js@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.4.tgz#dc2ba501ee3d58b7bb893c5d1fab47294917e7e7" js-levenshtein@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.3.tgz#3ef627df48ec8cf24bacf05c0f184ff30ef413c5" + version "1.1.6" + resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" + integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g== js-string-escape@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8= "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-types@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/js-types/-/js-types-1.0.0.tgz#d242e6494ed572ad3c92809fc8bed7f7687cbf03" - -js-yaml@^3.12.0, js-yaml@^3.9.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" +js-tokens@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" + integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0: +js-types@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/js-types/-/js-types-1.0.0.tgz#d242e6494ed572ad3c92809fc8bed7f7687cbf03" + integrity sha1-0kLmSU7Vcq08koCfyL7X92h8vwM= + +js-yaml@3.13.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -5663,93 +6143,109 @@ js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.7.0: jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= jsesc@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe" + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= json-stable-stringify@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45" + integrity sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U= dependencies: jsonify "~0.0.0" json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" +json5@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" + integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ== + dependencies: + minimist "^1.2.0" jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= optionalDependencies: graceful-fs "^4.1.6" jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" + integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= dependencies: assert-plus "1.0.0" extsprintf "1.3.0" json-schema "0.2.3" verror "1.10.0" -karma-browserify@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-5.3.0.tgz#9001796dfd1196cbc0327b022a00c6345a28e5dd" +karma-browserify@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-6.1.0.tgz#ac23be7172d1ae25c5f5f34b09d3c36cd99abb3e" + integrity sha512-FWOuATeil6dbm2nwWIbSFG0Ad8w3PcuBNs05zcqnMiuXEdwos/o6B26HF+NcYwTt3o7LTOGWiuXK9cuuhoPeaw== dependencies: convert-source-map "^1.1.3" hat "^0.0.3" js-string-escape "^1.0.0" - lodash "^4.17.10" + lodash "^4.17.14" minimatch "^3.0.0" os-shim "^0.1.3" -karma-chrome-launcher@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf" +karma-chrome-launcher@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738" + integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg== dependencies: - fs-access "^1.0.0" which "^1.2.1" -karma-firefox-launcher@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339" +karma-firefox-launcher@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.2.0.tgz#64fe03dd10300f9754d48f9ebfbf31f6c94a200c" + integrity sha512-j9Zp8M8+VLq1nI/5xZGfzeaEPtGQ/vk3G+Y8vpmFWLvKLNZ2TDjD6cu2dUu7lDbu1HXNgatsAX4jgCZTkR9qhQ== + dependencies: + is-wsl "^2.1.0" karma-mocha-reporter@^2.2.5: version "2.2.5" @@ -5765,26 +6261,27 @@ karma-mocha@^1.3.0: dependencies: minimist "1.2.0" -karma@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3" +karma@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/karma/-/karma-4.3.0.tgz#e14471ea090a952265a42ebb442b1a3c09832559" + integrity sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ== dependencies: bluebird "^3.3.0" body-parser "^1.16.1" - chokidar "^2.0.3" + braces "^3.0.2" + chokidar "^3.0.0" colors "^1.1.0" - combine-lists "^1.0.0" connect "^3.6.0" - core-js "^2.2.0" + core-js "^3.1.3" di "^0.0.1" dom-serialize "^2.2.0" - expand-braces "^0.1.1" + flatted "^2.0.0" glob "^7.1.1" graceful-fs "^4.1.2" http-proxy "^1.13.0" isbinaryfile "^3.0.0" - lodash "^4.17.4" - log4js "^3.0.0" + lodash "^4.17.14" + log4js "^4.0.0" mime "^2.3.1" minimatch "^3.0.2" optimist "^0.6.1" @@ -5795,61 +6292,65 @@ karma@^3.0.0: socket.io "2.1.1" source-map "^0.6.1" tmp "0.0.33" - useragent "2.2.1" + useragent "2.3.0" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= dependencies: is-buffer "^1.1.5" kind-of@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= dependencies: is-buffer "^1.1.5" kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" + integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== labeled-stream-splicer@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz#9cffa32fd99e1612fd1d86a8db962416d5292926" + version "2.0.2" + resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21" + integrity sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw== dependencies: inherits "^2.0.1" - isarray "^2.0.4" stream-splicer "^2.0.0" latest-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" + integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU= dependencies: package-json "^4.0.0" -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - lcid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= dependencies: invert-kv "^1.0.0" lcid@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" + integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== dependencies: invert-kv "^2.0.0" -lerna-changelog@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/lerna-changelog/-/lerna-changelog-0.8.0.tgz#a525531e850f03ca25512acc535a712fce32cc86" +lerna-changelog@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/lerna-changelog/-/lerna-changelog-0.8.2.tgz#05dc24add91741a4c198a79f82a1a4ac3fbb4754" + integrity sha512-GrWs8K3DrPpO1sUrcloYp9ioj+PNAX27U6tM0+10fhbNzBB7h4HS+4N5DWKhEQRDoJjZh1QA+wWwTpDNJdJHyA== dependencies: chalk "^2.4.1" cli-highlight "^1.2.3" @@ -5861,103 +6362,76 @@ lerna-changelog@^0.8.0: string.prototype.padend "^3.0.0" yargs "^11.0.0" -lerna@^3.13.4: - version "3.13.4" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.13.4.tgz#03026c11c5643f341fda42e4fb1882e2df35e6cb" - integrity sha512-qTp22nlpcgVrJGZuD7oHnFbTk72j2USFimc2Pj4kC0/rXmcU2xPtCiyuxLl8y6/6Lj5g9kwEuvKDZtSXujjX/A== +lerna@^3.16.4: + version "3.16.4" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.16.4.tgz#158cb4f478b680f46f871d5891f531f3a2cb31ec" + integrity sha512-0HfwXIkqe72lBLZcNO9NMRfylh5Ng1l8tETgYQ260ZdHRbPuaLKE3Wqnd2YYRRkWfwPyEyZO8mZweBR+slVe1A== dependencies: - "@lerna/add" "3.13.3" - "@lerna/bootstrap" "3.13.3" - "@lerna/changed" "3.13.4" - "@lerna/clean" "3.13.3" + "@lerna/add" "3.16.2" + "@lerna/bootstrap" "3.16.2" + "@lerna/changed" "3.16.4" + "@lerna/clean" "3.16.0" "@lerna/cli" "3.13.0" - "@lerna/create" "3.13.3" - "@lerna/diff" "3.13.3" - "@lerna/exec" "3.13.3" - "@lerna/import" "3.13.4" - "@lerna/init" "3.13.3" - "@lerna/link" "3.13.3" - "@lerna/list" "3.13.3" - "@lerna/publish" "3.13.4" - "@lerna/run" "3.13.3" - "@lerna/version" "3.13.4" - import-local "^1.0.0" + "@lerna/create" "3.16.0" + "@lerna/diff" "3.16.0" + "@lerna/exec" "3.16.0" + "@lerna/import" "3.16.0" + "@lerna/init" "3.16.0" + "@lerna/link" "3.16.2" + "@lerna/list" "3.16.0" + "@lerna/publish" "3.16.4" + "@lerna/run" "3.16.0" + "@lerna/version" "3.16.4" + import-local "^2.0.0" npmlog "^4.1.2" -leven@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" - levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= dependencies: prelude-ls "~1.1.2" type-check "~0.3.2" -libnpmaccess@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.1.tgz#5b3a9de621f293d425191aa2e779102f84167fa8" - integrity sha512-RlZ7PNarCBt+XbnP7R6PoVgOq9t+kou5rvhaInoNibhPO7eMlRfS0B8yjatgn2yaHIwWNyoJDolC/6Lc5L/IQA== - dependencies: - aproba "^2.0.0" - get-stream "^4.0.0" - npm-package-arg "^6.1.0" - npm-registry-fetch "^3.8.0" - -libnpmpublish@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.1.tgz#ff0c6bb0b4ad2bda2ad1f5fba6760a4af37125f0" - integrity sha512-nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g== - dependencies: - aproba "^2.0.0" - figgy-pudding "^3.5.1" - get-stream "^4.0.0" - lodash.clonedeep "^4.5.0" - normalize-package-data "^2.4.0" - npm-package-arg "^6.1.0" - npm-registry-fetch "^3.8.0" - semver "^5.5.1" - ssri "^6.0.1" - line-column-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/line-column-path/-/line-column-path-1.0.0.tgz#383b83fca8488faa7a59940ebf28b82058c16c55" + integrity sha1-ODuD/KhIj6p6WZQOvyi4IFjBbFU= -lint-staged@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.3.0.tgz#90ff33e5ca61ed3dbac35b6f6502dbefdc0db58d" +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +lint-staged@^9.2.5: + version "9.2.5" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.2.5.tgz#5a3e1e0a539a403bd7f88542bc3d34ce52efdbb3" + integrity sha512-d99gTBFMJ29159+9iRvaMEQstmNcPAbQbhHSYw6D/1FncvFdIj8lWHztaq3Uq+tbZPABHXQ/fyN7Rp1QwF8HIw== dependencies: - chalk "^2.3.1" - commander "^2.14.1" - cosmiconfig "^5.0.2" - debug "^3.1.0" + chalk "^2.4.2" + commander "^2.20.0" + cosmiconfig "^5.2.1" + debug "^4.1.1" dedent "^0.7.0" - execa "^0.9.0" - find-parent-dir "^0.3.0" - is-glob "^4.0.0" - is-windows "^1.0.2" - jest-validate "^23.5.0" - listr "^0.14.1" - lodash "^4.17.5" - log-symbols "^2.2.0" - micromatch "^3.1.8" - npm-which "^3.0.1" - p-map "^1.1.1" - path-is-inside "^1.0.2" - pify "^3.0.0" - please-upgrade-node "^3.0.2" - staged-git-files "1.1.1" - string-argv "^0.0.2" - stringify-object "^3.2.2" + del "^5.0.0" + execa "^2.0.3" + listr "^0.14.3" + log-symbols "^3.0.0" + micromatch "^4.0.2" + normalize-path "^3.0.0" + please-upgrade-node "^3.1.1" + string-argv "^0.3.0" + stringify-object "^3.3.0" listr-silent-renderer@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" + integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= -listr-update-renderer@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.4.0.tgz#344d980da2ca2e8b145ba305908f32ae3f4cc8a7" +listr-update-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" + integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== dependencies: chalk "^1.1.3" cli-truncate "^0.2.1" @@ -5965,38 +6439,33 @@ listr-update-renderer@^0.4.0: figures "^1.7.0" indent-string "^3.0.0" log-symbols "^1.0.2" - log-update "^1.0.2" + log-update "^2.3.0" strip-ansi "^3.0.1" -listr-verbose-renderer@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#8206f4cf6d52ddc5827e5fd14989e0e965933a35" +listr-verbose-renderer@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" + integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== dependencies: - chalk "^1.1.3" - cli-cursor "^1.0.2" + chalk "^2.4.1" + cli-cursor "^2.1.0" date-fns "^1.27.2" - figures "^1.7.0" + figures "^2.0.0" -listr@^0.14.1: - version "0.14.1" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.1.tgz#8a7afa4a7135cee4c921d128e0b7dfc6e522d43d" +listr@^0.14.3: + version "0.14.3" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" + integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== dependencies: "@samverschueren/stream-to-observable" "^0.3.0" - cli-truncate "^0.2.1" - figures "^1.7.0" - indent-string "^2.1.0" is-observable "^1.1.0" is-promise "^2.1.0" is-stream "^1.1.0" listr-silent-renderer "^1.1.1" - listr-update-renderer "^0.4.0" - listr-verbose-renderer "^0.4.0" - log-symbols "^1.0.2" - log-update "^1.0.2" - ora "^0.2.3" - p-map "^1.1.1" - rxjs "^6.1.0" - strip-ansi "^3.0.1" + listr-update-renderer "^0.5.0" + listr-verbose-renderer "^0.5.0" + p-map "^2.0.0" + rxjs "^6.3.3" load-bmfont@^1.3.1: version "1.3.1" @@ -6026,6 +6495,7 @@ load-bmfont@^1.4.0: load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -6036,6 +6506,7 @@ load-json-file@^1.0.0: load-json-file@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" + integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -6045,15 +6516,28 @@ load-json-file@^2.0.0: load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= dependencies: graceful-fs "^4.1.2" parse-json "^4.0.0" pify "^3.0.0" strip-bom "^3.0.0" +load-json-file@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3" + integrity sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw== + dependencies: + graceful-fs "^4.1.15" + parse-json "^4.0.0" + pify "^4.0.1" + strip-bom "^3.0.0" + type-fest "^0.3.0" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= dependencies: p-locate "^2.0.0" path-exists "^3.0.0" @@ -6061,13 +6545,22 @@ locate-path@^2.0.0: locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== dependencies: p-locate "^3.0.0" path-exists "^3.0.0" -lodash._reinterpolate@~3.0.0: +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= lodash.assign@^4.2.0: version "4.2.0" @@ -6077,6 +6570,7 @@ lodash.assign@^4.2.0: lodash.camelcase@^4.1.1, lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= lodash.chunk@^4.2.0: version "4.2.0" @@ -6088,21 +6582,20 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - lodash.flattendeep@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" + integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= lodash.ismatch@^4.4.0: version "4.4.0" @@ -6112,14 +6605,17 @@ lodash.ismatch@^4.4.0: lodash.kebabcase@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" + integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= lodash.mergewith@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" + integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== lodash.set@^4.3.2: version "4.3.2" @@ -6129,23 +6625,27 @@ lodash.set@^4.3.2: lodash.snakecase@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" + integrity sha1-OdcUo1NXFHg3rv1ktdy7Fr7Nj40= lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= -lodash.template@^4.0.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0" +lodash.template@^4.0.2, lodash.template@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== dependencies: - lodash._reinterpolate "~3.0.0" + lodash._reinterpolate "^3.0.0" lodash.templatesettings "^4.0.0" lodash.templatesettings@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316" + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== dependencies: - lodash._reinterpolate "~3.0.0" + lodash._reinterpolate "^3.0.0" lodash.uniq@^4.5.0: version "4.5.0" @@ -6155,56 +6655,69 @@ lodash.uniq@^4.5.0: lodash.upperfirst@^4.2.0: version "4.3.1" resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + integrity sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984= lodash.zip@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020" + integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA= -lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" +lodash@^4.13.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.2.1: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + +log-symbols@2.2.0, log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + dependencies: + chalk "^2.0.1" log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= dependencies: chalk "^1.0.0" -log-symbols@^2.0.0, log-symbols@^2.1.0, log-symbols@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" +log-symbols@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" + integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== dependencies: - chalk "^2.0.1" + chalk "^2.4.2" -log-update@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1" +log-update@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" + integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= dependencies: - ansi-escapes "^1.0.0" - cli-cursor "^1.0.2" + ansi-escapes "^3.0.0" + cli-cursor "^2.0.0" + wrap-ansi "^3.0.1" -log4js@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.4.tgz#dfb2fc1782766bace1aabd00008460f6d994d159" +log4js@^4.0.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5" + integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw== dependencies: - circular-json "^0.5.5" - date-format "^1.2.0" - debug "^3.1.0" - streamroller "0.7.0" - -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" + date-format "^2.0.0" + debug "^4.1.1" + flatted "^2.0.0" + rfdc "^1.1.4" + streamroller "^1.0.6" loose-envify@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -6212,14 +6725,12 @@ loud-rejection@^1.0.0: lowercase-keys@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== -lru-cache@2.2.x: - version "2.2.4" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d" - -lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" +lru-cache@4.1.x, lru-cache@^4.0.1: + version "4.1.5" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" + integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== dependencies: pseudomap "^1.0.2" yallist "^2.1.2" @@ -6232,30 +6743,57 @@ lru-cache@^5.1.1: yallist "^3.0.2" macos-release@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8" - integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.3.0.tgz#eb1930b036c0800adebccd5f17bc4c12de8bb71f" + integrity sha512-OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA== -make-dir@^1.0.0, make-dir@^1.3.0: +make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" + integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== dependencies: pify "^3.0.0" +make-dir@^2.0.0, make-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + make-error@^1.1.1: version "1.3.5" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8" make-fetch-happen@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083" + version "4.0.2" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz#2d156b11696fb32bffbafe1ac1bc085dd6c78a79" + integrity sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA== + dependencies: + agentkeepalive "^3.4.1" + cacache "^11.3.3" + http-cache-semantics "^3.8.1" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + lru-cache "^5.1.1" + mississippi "^3.0.0" + node-fetch-npm "^2.0.2" + promise-retry "^1.1.1" + socks-proxy-agent "^4.0.0" + ssri "^6.0.0" + +make-fetch-happen@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d" + integrity sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA== dependencies: agentkeepalive "^3.4.1" - cacache "^11.0.1" + cacache "^12.0.0" http-cache-semantics "^3.8.1" http-proxy-agent "^2.1.0" https-proxy-agent "^2.2.1" - lru-cache "^4.1.2" + lru-cache "^5.1.1" mississippi "^3.0.0" node-fetch-npm "^2.0.2" promise-retry "^1.1.1" @@ -6263,71 +6801,68 @@ make-fetch-happen@^4.0.1: ssri "^6.0.0" map-age-cleaner@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74" + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== dependencies: p-defer "^1.0.0" map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= map-obj@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" + integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk= map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= dependencies: object-visit "^1.0.0" -math-random@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" - -md5-hex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33" - dependencies: - md5-o-matic "^0.1.1" - -md5-o-matic@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3" - md5.js@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" + version "1.3.5" + resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" + integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== dependencies: hash-base "^3.0.0" inherits "^2.0.1" + safe-buffer "^5.1.2" media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= mem@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" + integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= dependencies: mimic-fn "^1.0.0" mem@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf" + version "4.3.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" + integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== dependencies: map-age-cleaner "^0.1.1" - mimic-fn "^1.0.0" - p-is-promise "^1.1.0" + mimic-fn "^2.0.0" + p-is-promise "^2.0.0" meow@^3.3.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -6343,6 +6878,7 @@ meow@^3.3.0: meow@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975" + integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A== dependencies: camelcase-keys "^4.0.0" decamelize-keys "^1.0.0" @@ -6357,6 +6893,7 @@ meow@^4.0.0: meow@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" + integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig== dependencies: camelcase-keys "^4.0.0" decamelize-keys "^1.0.0" @@ -6371,42 +6908,34 @@ meow@^5.0.0: merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= merge-source-map@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== dependencies: source-map "^0.6.1" -merge2@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34" +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.2.3: + version "1.3.0" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" + integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw== methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" @@ -6422,38 +6951,52 @@ micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8: snapdragon "^0.8.1" to-regex "^3.0.2" +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" + integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== dependencies: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@~1.35.0: - version "1.35.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47" +mime-db@1.40.0: + version "1.40.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" + integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== -mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19: - version "2.1.19" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0" +mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.24" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" + integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== dependencies: - mime-db "~1.35.0" + mime-db "1.40.0" -mime@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" - -mime@^1.3.4: +mime@1.6.0, mime@^1.3.4: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" mime@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" + version "2.4.4" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" + integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" + integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + +mimic-fn@^2.0.0, mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== min-document@^2.19.0: version "2.19.0" @@ -6464,20 +7007,24 @@ min-document@^2.19.0: minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" minimist-options@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" + integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ== dependencies: arrify "^1.0.1" is-plain-obj "^1.1.0" @@ -6485,6 +7032,7 @@ minimist-options@^3.0.1: minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" + integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" @@ -6493,38 +7041,27 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2 minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" + integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= -minipass@^2.2.1, minipass@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233" - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minipass@^2.3.4, minipass@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848" - integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA== +minipass@^2.2.1, minipass@^2.3.5, minipass@^2.6.0, minipass@^2.6.4: + version "2.6.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.6.5.tgz#1c245f9f2897f70fd4a219066261ce6c29f80b18" + integrity sha512-ewSKOPFH9blOLXx0YSE+mbrNMBFPS+11a2b03QZ+P4LVrUHW/GAlqeYC7DBknDyMWkHzrzTpDhUvy7MUxqyrPA== dependencies: safe-buffer "^5.1.2" yallist "^3.0.0" -minizlib@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" - dependencies: - minipass "^2.2.1" - -minizlib@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614" - integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA== +minizlib@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.2.tgz#6f0ccc82fa53e1bf2ff145f220d2da9fa6e3a166" + integrity sha512-hR3At21uSrsjjDTWrbu0IMLTpnkpv8IIMFDFaoz43Tmu4LkmAXfH44vNNzpTnf+OAQQCHrb91y/wc2J4x5XgSQ== dependencies: minipass "^2.2.1" mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" + integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== dependencies: concat-stream "^1.5.0" duplexify "^3.4.2" @@ -6538,45 +7075,69 @@ mississippi@^3.0.0: through2 "^2.0.0" mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== dependencies: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: +mkdirp-promise@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1" + integrity sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE= + dependencies: + mkdirp "*" + +mkdirp@*, mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" + integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= dependencies: minimist "0.0.8" -mocha@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" +mocha@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.0.tgz#f896b642843445d1bb8bca60eabd9206b8916e56" + integrity sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ== dependencies: + ansi-colors "3.2.3" browser-stdout "1.3.1" - commander "2.15.1" - debug "3.1.0" + debug "3.2.6" diff "3.5.0" escape-string-regexp "1.0.5" - glob "7.1.2" + find-up "3.0.0" + glob "7.1.3" growl "1.10.5" - he "1.1.1" + he "1.2.0" + js-yaml "3.13.1" + log-symbols "2.2.0" minimatch "3.0.4" mkdirp "0.5.1" - supports-color "5.4.0" + ms "2.1.1" + node-environment-flags "1.0.5" + object.assign "4.1.0" + strip-json-comments "2.0.1" + supports-color "6.0.0" + which "1.3.1" + wide-align "1.1.3" + yargs "13.2.2" + yargs-parser "13.0.0" + yargs-unparser "1.5.0" modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" + integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== module-deps@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz#d1e1efc481c6886269f7112c52c3236188e16479" + version "6.2.1" + resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.1.tgz#cfe558784060e926824f474b4e647287837cda50" + integrity sha512-UnEn6Ah36Tu4jFiBbJVUtt0h+iXqxpLqDvPS8nllbw5RZFmNJ1+Mz5BjYnM9ieH80zyxHkARGLnMIHlPK5bu6A== dependencies: JSONStream "^1.0.3" browser-resolve "^1.7.0" - cached-path-relative "^1.0.0" + cached-path-relative "^1.0.2" concat-stream "~1.6.0" defined "^1.0.0" detective "^5.0.2" @@ -6593,6 +7154,7 @@ module-deps@^6.0.0: move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" + integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= dependencies: aproba "^1.1.1" copy-concurrently "^1.0.0" @@ -6604,39 +7166,66 @@ move-concurrently@^1.0.1: ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@^2.0.0: +ms@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + +ms@^2.0.0, ms@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== multimatch@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" + integrity sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis= dependencies: array-differ "^1.0.0" array-union "^1.0.1" arrify "^1.0.0" minimatch "^3.0.0" -mute-stream@0.0.7, mute-stream@~0.0.4: +multimatch@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-3.0.0.tgz#0e2534cc6bc238d9ab67e1b9cd5fcd85a6dbf70b" + integrity sha512-22foS/gqQfANZ3o+W7ST2x25ueHDVNWl/b9OlGcLpy/iKxjCpvcNCM51YCenUi7Mt/jAjjqv8JwZRs8YP5sRjA== + dependencies: + array-differ "^2.0.3" + array-union "^1.0.2" + arrify "^1.0.1" + minimatch "^3.0.4" + +mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" + integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= + +mute-stream@~0.0.4: + version "0.0.8" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -mz@^2.4.0: +mz@^2.4.0, mz@^2.5.0: version "2.7.0" resolved "https://registry.yarnpkg.com/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32" + integrity sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== dependencies: any-promise "^1.0.0" object-assign "^4.0.1" thenify-all "^1.0.0" -nan@^2.9.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" +nan@^2.12.1: + version "2.14.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" + integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" @@ -6653,70 +7242,85 @@ nanomatch@^1.2.9: natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= needle@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d" + version "2.4.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" + integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== dependencies: - debug "^2.1.2" + debug "^3.2.6" iconv-lite "^0.4.4" sax "^1.2.4" -negotiator@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== neo-async@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" - integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" + integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + +nested-error-stacks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" + integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug== nice-try@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-environment-flags@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a" + integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ== + dependencies: + object.getownpropertydescriptors "^2.0.3" + semver "^5.7.0" node-fetch-npm@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7" + integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw== dependencies: encoding "^0.1.11" json-parse-better-errors "^1.0.0" safe-buffer "^5.1.1" -node-fetch@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.5.0.tgz#8028c49fc1191bba56a07adc6e2a954644a48501" - integrity sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw== - -node-fetch@^2.3.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.4.1.tgz#b2e38f1117b8acbedbe0524f041fb3177188255d" - integrity sha512-P9UbpFK87NyqBZzUuDBDz4f6Yiys8xm8j7ACDbi6usvFm6KItklQUKjeoqTrYS/S1k6I8oaOC2YLLDr/gg26Mw== +node-fetch@2.6.0, node-fetch@^2.3.0, node-fetch@^2.5.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" + integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -node-gyp@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" +node-gyp@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45" + integrity sha512-z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ== dependencies: - fstream "^1.0.0" + env-paths "^1.0.0" glob "^7.0.3" graceful-fs "^4.1.2" mkdirp "^0.5.0" nopt "2 || 3" npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" request "^2.87.0" rimraf "2" semver "~5.3.0" - tar "^2.0.0" + tar "^4.4.8" which "1" node-modules-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-pre-gyp@^0.10.0: - version "0.10.3" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc" +node-pre-gyp@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" + integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" @@ -6729,21 +7333,24 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-releases@^1.0.0-alpha.11: - version "1.0.0-alpha.11" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a" +node-releases@^1.1.29: + version "1.1.32" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.32.tgz#485b35c1bf9b4d8baa105d782f8ca731e518276e" + integrity sha512-VhVknkitq8dqtWoluagsGPn3dxTvN9fwgR59fV3D7sLBHe0JfDramsMI8n8mY//ccq/Kkrf8ZRHRpsyVZ3qw1A== dependencies: semver "^5.3.0" "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" + integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= dependencies: abbrev "1" nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" + integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= dependencies: abbrev "1" osenv "^0.1.4" @@ -6751,39 +7358,48 @@ nopt@^4.0.1: normalize-git-url@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/normalize-git-url/-/normalize-git-url-3.0.2.tgz#8e5f14be0bdaedb73e07200310aa416c27350fc4" + integrity sha1-jl8Uvgva7bc+ByADEKpBbCc1D8Q= -normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" +normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== dependencies: hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" + resolve "^1.10.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: +normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= dependencies: remove-trailing-separator "^1.0.1" +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + normalize-url@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== npm-bundled@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" + version "1.0.6" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" + integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g== -npm-lifecycle@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569" - integrity sha512-QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g== +npm-lifecycle@^3.1.2: + version "3.1.4" + resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz#de6975c7d8df65f5150db110b57cce498b0b604c" + integrity sha512-tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A== dependencies: byline "^5.0.0" - graceful-fs "^4.1.11" - node-gyp "^3.8.0" + graceful-fs "^4.1.15" + node-gyp "^5.0.2" resolve-from "^4.0.0" slide "^1.1.6" uid-number "0.0.6" @@ -6791,175 +7407,173 @@ npm-lifecycle@^2.1.0: which "^1.3.1" "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1" + version "6.1.1" + resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7" + integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg== dependencies: - hosted-git-info "^2.6.0" + hosted-git-info "^2.7.1" osenv "^0.1.5" - semver "^5.5.0" + semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.12, npm-packlist@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc" - integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npm-packlist@^1.1.6: - version "1.1.11" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de" +npm-packlist@^1.1.6, npm-packlist@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44" + integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw== dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" -npm-path@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64" - dependencies: - which "^1.2.10" - -npm-pick-manifest@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40" - integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA== +npm-pick-manifest@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7" + integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw== dependencies: figgy-pudding "^3.5.1" npm-package-arg "^6.0.0" semver "^5.4.1" -npm-registry-fetch@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc" - dependencies: - JSONStream "^1.3.4" - bluebird "^3.5.1" - figgy-pudding "^3.4.1" - lru-cache "^4.1.3" - make-fetch-happen "^4.0.1" - npm-package-arg "^6.1.0" - -npm-registry-fetch@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz#44d841780e2833f06accb34488f8c7450d1a6856" - integrity sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw== - dependencies: - JSONStream "^1.3.4" - bluebird "^3.5.1" - figgy-pudding "^3.4.1" - lru-cache "^4.1.3" - make-fetch-happen "^4.0.1" - npm-package-arg "^6.1.0" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= dependencies: path-key "^2.0.0" -npm-which@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa" +npm-run-path@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" + integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== dependencies: - commander "^2.9.0" - npm-path "^2.0.2" - which "^1.2.10" + path-key "^3.0.0" "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== dependencies: are-we-there-yet "~1.1.2" console-control-strings "~1.1.0" gauge "~2.7.3" set-blocking "~2.0.0" -null-check@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -nyc@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/nyc/-/nyc-13.0.1.tgz#b61857ed633c803353fc41eeca775d0e1f62034b" +nyc@^14.1.1: + version "14.1.1" + resolved "https://registry.yarnpkg.com/nyc/-/nyc-14.1.1.tgz#151d64a6a9f9f5908a1b73233931e4a0a3075eeb" + integrity sha512-OI0vm6ZGUnoGZv/tLdZ2esSVzDwUC88SNs+6JoSOMVxA+gKMB8Tk7jBwgemLx4O40lhhvZCVw1C+OYLOBOPXWw== dependencies: archy "^1.0.0" - arrify "^1.0.1" - caching-transform "^2.0.0" - convert-source-map "^1.5.1" - debug-log "^1.0.1" - find-cache-dir "^2.0.0" + caching-transform "^3.0.2" + convert-source-map "^1.6.0" + cp-file "^6.2.0" + find-cache-dir "^2.1.0" find-up "^3.0.0" foreground-child "^1.5.6" - glob "^7.1.2" - istanbul-lib-coverage "^2.0.1" - istanbul-lib-hook "^2.0.1" - istanbul-lib-instrument "^2.3.2" - istanbul-lib-report "^2.0.1" - istanbul-lib-source-maps "^2.0.1" - istanbul-reports "^2.0.0" - make-dir "^1.3.0" + glob "^7.1.3" + istanbul-lib-coverage "^2.0.5" + istanbul-lib-hook "^2.0.7" + istanbul-lib-instrument "^3.3.0" + istanbul-lib-report "^2.0.8" + istanbul-lib-source-maps "^3.0.6" + istanbul-reports "^2.2.4" + js-yaml "^3.13.1" + make-dir "^2.1.0" merge-source-map "^1.1.0" resolve-from "^4.0.0" - rimraf "^2.6.2" + rimraf "^2.6.3" signal-exit "^3.0.2" spawn-wrap "^1.4.2" - test-exclude "^5.0.0" + test-exclude "^5.2.3" uuid "^3.3.2" - yargs "11.1.0" - yargs-parser "^9.0.2" + yargs "^13.2.2" + yargs-parser "^13.0.0" oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== obj-props@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/obj-props/-/obj-props-1.1.0.tgz#626313faa442befd4a44e9a02c3cb6bde937b511" + version "1.2.0" + resolved "https://registry.yarnpkg.com/obj-props/-/obj-props-1.2.0.tgz#3dbaa849f30238d84206c8b7192e1ce54d0d43b2" + integrity sha512-ZYpJyCe7O4rhNxB/2SZy8ADJww8RSRBdG36a4MWWq7JwILGJ1m61B90QJtxwDDNA0KzyR8V12Wikpjuux7Gl9Q== -object-assign@^4.0.1, object-assign@^4.1.0: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-component@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" + integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE= object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= dependencies: copy-descriptor "^0.1.0" define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.8: - version "1.0.12" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2" +object-inspect@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" + integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= dependencies: isobject "^3.0.0" -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" +object.assign@4.1.0, object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + +object.getownpropertydescriptors@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" + integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= + dependencies: + define-properties "^1.1.2" + es-abstract "^1.5.1" object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= dependencies: isobject "^3.0.1" +object.values@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" + integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.12.0" + function-bind "^1.1.1" + has "^1.0.3" + octokit-pagination-methods@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" @@ -6972,42 +7586,56 @@ omggif@^1.0.9: on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" -onetime@^1.0.0: - version "1.1.0" - resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" - onetime@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" + integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= dependencies: mimic-fn "^1.0.0" +onetime@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" + integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== + dependencies: + mimic-fn "^2.1.0" + open-editor@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/open-editor/-/open-editor-1.2.0.tgz#75ca23f0b74d4b3f55ee0b8a4e0f5c2325eb775f" + integrity sha1-dcoj8LdNSz9V7guKTg9cIyXrd18= dependencies: env-editor "^0.3.1" line-column-path "^1.0.0" opn "^5.0.0" +opencollective-postinstall@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + opn@^5.0.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c" + version "5.5.0" + resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" + integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== dependencies: is-wsl "^1.1.0" optimist@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" + integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= dependencies: minimist "~0.0.1" wordwrap "~0.0.2" @@ -7015,6 +7643,7 @@ optimist@^0.6.1: optionator@^0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" + integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q= dependencies: deep-is "~0.1.3" fast-levenshtein "~2.0.4" @@ -7023,40 +7652,35 @@ optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" -ora@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4" - dependencies: - chalk "^1.1.1" - cli-cursor "^1.0.2" - cli-spinners "^0.1.2" - object-assign "^4.0.1" - os-browserify@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" + integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= os-locale@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" + integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== dependencies: execa "^0.7.0" lcid "^1.0.0" mem "^1.1.0" -os-locale@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620" +os-locale@^3.0.0, os-locale@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" + integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== dependencies: - execa "^0.10.0" + execa "^1.0.0" lcid "^2.0.0" mem "^4.0.0" -os-name@^3.0.0: +os-name@^3.0.0, os-name@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== @@ -7067,14 +7691,17 @@ os-name@^3.0.0: os-shim@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" + integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@0, osenv@^0.1.4, osenv@^0.1.5: +osenv@^0.1.4, osenv@^0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== dependencies: os-homedir "^1.0.0" os-tmpdir "^1.0.0" @@ -7082,12 +7709,14 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5: outpipe@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/outpipe/-/outpipe-1.1.1.tgz#50cf8616365e87e031e29a5ec9339a3da4725fa2" + integrity sha1-UM+GFjZeh+Ax4ppeyTOaPaRyX6I= dependencies: shell-quote "^1.4.2" output-file-sync@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0" + integrity sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ== dependencies: graceful-fs "^4.1.11" is-plain-obj "^1.1.0" @@ -7096,149 +7725,179 @@ output-file-sync@^2.0.0: p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-is-promise@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e" +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + +p-is-promise@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== dependencies: p-try "^1.0.0" -p-limit@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec" +p-limit@^2.0.0, p-limit@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== dependencies: p-try "^2.0.0" p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= dependencies: p-limit "^1.1.0" p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-map-series@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" + integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco= dependencies: p-reduce "^1.0.0" -p-map@^1.1.1, p-map@^1.2.0: +p-map@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" + integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== + +p-map@^2.0.0, p-map@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== + +p-map@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" + integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== + dependencies: + aggregate-error "^3.0.0" p-pipe@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9" + integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k= + +p-queue@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-4.0.0.tgz#ed0eee8798927ed6f2c2f5f5b77fdb2061a5d346" + integrity sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg== + dependencies: + eventemitter3 "^3.1.0" p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" + integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" + integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= p-try@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== p-waterfall@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-waterfall/-/p-waterfall-1.0.0.tgz#7ed94b3ceb3332782353af6aae11aa9fc235bb00" + integrity sha1-ftlLPOszMngjU69qrhGqn8I1uwA= dependencies: p-reduce "^1.0.0" -package-hash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-2.0.0.tgz#78ae326c89e05a4d813b68601977af05c00d2a0d" +package-hash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-3.0.0.tgz#50183f2d36c9e3e528ea0a8605dff57ce976f88e" + integrity sha512-lOtmukMDVvtkL84rJHI7dpTYq+0rli8N2wlnqUcBuDWCfVhRUfOmnR9SsoHFMLpACvEV60dX7rd0rFaYDZI+FA== dependencies: - graceful-fs "^4.1.11" + graceful-fs "^4.1.15" + hasha "^3.0.0" lodash.flattendeep "^4.4.0" - md5-hex "^2.0.0" release-zalgo "^1.0.0" package-json@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" + integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= dependencies: got "^6.7.1" registry-auth-token "^3.0.1" registry-url "^3.0.3" semver "^5.1.0" -pacote@^9.5.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda" - integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg== - dependencies: - bluebird "^3.5.3" - cacache "^11.3.2" - figgy-pudding "^3.5.1" - get-stream "^4.1.0" - glob "^7.1.3" - lru-cache "^5.1.1" - make-fetch-happen "^4.0.1" - minimatch "^3.0.4" - minipass "^2.3.5" - mississippi "^3.0.0" - mkdirp "^0.5.1" - normalize-package-data "^2.4.0" - npm-package-arg "^6.1.0" - npm-packlist "^1.1.12" - npm-pick-manifest "^2.2.3" - npm-registry-fetch "^3.8.0" - osenv "^0.1.5" - promise-inflight "^1.0.1" - promise-retry "^1.1.1" - protoduck "^5.0.1" - rimraf "^2.6.2" - safe-buffer "^5.1.2" - semver "^5.6.0" - ssri "^6.0.1" - tar "^4.4.8" - unique-filename "^1.1.1" - which "^1.3.1" - -pako@^1.0.5, pako@~1.0.5: +pako@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" +pako@~1.0.5: + version "1.0.10" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" + integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== + parallel-transform@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06" + version "1.2.0" + resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" + integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== dependencies: - cyclist "~0.2.2" + cyclist "^1.0.1" inherits "^2.0.3" readable-stream "^2.1.5" +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + parents@^1.0.0, parents@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" + integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E= dependencies: path-platform "~0.11.15" parse-asn1@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" + version "5.1.5" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" + integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" + safe-buffer "^5.1.1" parse-author@^2.0.0: version "2.0.0" @@ -7265,21 +7924,13 @@ parse-bmfont-xml@^1.1.4: parse-github-repo-url@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50" + integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A= parse-github-url@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395" integrity sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw== -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - parse-headers@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.1.tgz#6ae83a7aa25a9d9b700acc28698cd1f1ed7e9536" @@ -7290,15 +7941,27 @@ parse-headers@^2.0.0: parse-json@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= dependencies: error-ex "^1.2.0" parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + +parse-json@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" + integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== dependencies: + "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" json-parse-better-errors "^1.0.1" + lines-and-columns "^1.1.6" parse-path@^4.0.0: version "4.0.1" @@ -7321,24 +7984,28 @@ parse-url@^5.0.0: parse5@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" + integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA== dependencies: "@types/node" "*" parseqs@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d" + integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0= dependencies: better-assert "~1.0.0" parseuri@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" + integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo= dependencies: better-assert "~1.0.0" -parseurl@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== parsimmon@^1.2.0: version "1.13.0" @@ -7348,52 +8015,74 @@ parsimmon@^1.2.0: pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= path-browserify@~0.0.0: version "0.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" + integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" + integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= path-exists@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= dependencies: pinkie-promise "^2.0.0" path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= path-is-inside@^1.0.1, path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3" + integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg== + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== path-platform@~0.11.15: version "0.11.15" resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" + integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= dependencies: graceful-fs "^4.1.2" pify "^2.0.0" @@ -7402,18 +8091,26 @@ path-type@^1.0.0: path-type@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" + integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= dependencies: pify "^2.0.0" path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== dependencies: pify "^3.0.0" +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + pbkdf2@^3.0.3: - version "3.0.16" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c" + version "3.0.17" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6" + integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -7424,32 +8121,48 @@ pbkdf2@^3.0.3: performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= phin@^2.9.1: version "2.9.1" resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.1.tgz#0de9059b1a9bd56fcb1bd8a374344a06f25f1901" +picomatch@^2.0.4, picomatch@^2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6" + integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA== + pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= dependencies: pinkie "^2.0.0" pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= pirates@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd" + version "4.0.1" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" + integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== dependencies: node-modules-regexp "^1.0.0" @@ -7462,16 +8175,11 @@ pixelmatch@^4.0.2: pkg-conf@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058" + integrity sha1-ISZRTKbyq/69FoWW3xi6V4Z/AFg= dependencies: find-up "^2.0.0" load-json-file "^4.0.0" -pkg-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" - dependencies: - find-up "^1.0.0" - pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -7481,30 +8189,37 @@ pkg-dir@^2.0.0: pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== dependencies: find-up "^3.0.0" +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= dependencies: find-up "^2.1.0" -please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac" +please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== dependencies: semver-compare "^1.0.0" -plur@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a" +plur@^3.0.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/plur/-/plur-3.1.1.tgz#60267967866a8d811504fe58f2faaba237546a5b" + integrity sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w== dependencies: - irregular-plurals "^1.0.0" - -pluralize@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" + irregular-plurals "^2.0.0" pngjs@^3.0.0, pngjs@^3.3.3: version "3.3.3" @@ -7513,61 +8228,63 @@ pngjs@^3.0.0, pngjs@^3.3.3: posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" + integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -prettier@^1.12.1: - version "1.13.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" - -prettier@^1.14.3: - version "1.14.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" - -pretty-format@^23.5.0: - version "23.5.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.5.0.tgz#0f9601ad9da70fe690a269cd3efca732c210687c" +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== dependencies: - ansi-regex "^3.0.0" - ansi-styles "^3.2.0" + fast-diff "^1.1.2" + +prettier@^1.15.2, prettier@^1.18.2: + version "1.18.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" + integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== private@^0.1.6: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== process@~0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= process@~0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" progress@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f" + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" + integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= promise-retry@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d" + integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0= dependencies: err-code "^1.0.0" retry "^0.10.0" @@ -7575,16 +8292,19 @@ promise-retry@^1.1.1: promzard@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" + integrity sha1-JqXW7ox97kyxIggwWs+5O6OCqe4= dependencies: read "1" proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= -proto-props@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proto-props/-/proto-props-1.1.0.tgz#e2606581dd24aa22398aeeeb628fc08e2ec89c91" +proto-props@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/proto-props/-/proto-props-2.0.0.tgz#8ac6e6dec658545815c623a3bc81580deda9a181" + integrity sha512-2yma2tog9VaRZY2mn3Wq51uiSW4NcPYT1cQdBagwyrznrilKSZwIZ0UG3ZPL/mx+axEns0hE35T5ufOYZXEnBQ== protocols@^1.1.0, protocols@^1.4.0: version "1.4.7" @@ -7598,34 +8318,40 @@ protoduck@^5.0.1: dependencies: genfun "^5.0.0" -proxy-addr@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93" +proxy-addr@~2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" + integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== dependencies: forwarded "~0.1.2" - ipaddr.js "1.8.0" + ipaddr.js "1.9.0" pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" + integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= psl@^1.1.24: - version "1.1.29" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67" + version "1.4.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2" + integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw== public-encrypt@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" + version "4.0.3" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" + integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== dependencies: bn.js "^4.1.0" browserify-rsa "^4.0.0" create-hash "^1.1.0" parse-asn1 "^5.0.0" randombytes "^2.0.1" + safe-buffer "^5.1.2" pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -7633,6 +8359,7 @@ pump@^2.0.0: pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== dependencies: end-of-stream "^1.1.0" once "^1.3.1" @@ -7640,6 +8367,7 @@ pump@^3.0.0: pumpify@^1.3.3: version "1.5.1" resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" + integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== dependencies: duplexify "^3.6.0" inherits "^2.0.3" @@ -7648,89 +8376,87 @@ pumpify@^1.3.3: punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= qjobs@^1.1.4: version "1.2.0" resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" + integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== -qs@6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@6.5.2, qs@~6.5.2: +qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== querystring-es3@~0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" - -randomatic@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116" - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" + integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== dependencies: safe-buffer "^5.1.0" randomfill@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" + integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== dependencies: randombytes "^2.0.5" safe-buffer "^5.1.0" -range-parser@^1.2.0, range-parser@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - -raw-body@2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" - dependencies: - bytes "3.0.0" - http-errors "1.6.2" - iconv-lite "0.4.19" - unpipe "1.0.0" +range-parser@^1.2.0, range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== dependencies: - bytes "3.0.0" - http-errors "1.6.3" - iconv-lite "0.4.23" + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" unpipe "1.0.0" rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== dependencies: deep-extend "^0.6.0" ini "~1.3.0" @@ -7738,20 +8464,23 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8: strip-json-comments "~2.0.1" read-cmd-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b" + version "1.0.4" + resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.4.tgz#b4a53d43376211b45243f0072b6e603a8e37640d" + integrity sha512-Pqpl3qJ/QdOIjRYA0q5DND/gLvGOfpIz/fYVDGYpOXfW/lFrIttmLsBnd6IkyK10+JHU9zhsaudfvrQTBB9YFQ== dependencies: graceful-fs "^4.1.2" read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" + integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A= dependencies: readable-stream "^2.0.2" "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a" + version "2.1.0" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.0.tgz#e3d42e6c35ea5ae820d9a03ab0c7291217fc51d5" + integrity sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A== dependencies: glob "^7.1.1" json-parse-better-errors "^1.0.1" @@ -7761,18 +8490,18 @@ read-only-stream@^2.0.0: graceful-fs "^4.1.2" read-package-tree@^5.1.6: - version "5.2.1" - resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.1.tgz#6218b187d6fac82289ce4387bbbaf8eef536ad63" + version "5.3.1" + resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636" + integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw== dependencies: - debuglog "^1.0.1" - dezalgo "^1.0.0" - once "^1.3.0" read-package-json "^2.0.0" readdir-scoped-modules "^1.0.0" + util-promisify "^2.1.0" read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= dependencies: find-up "^1.0.0" read-pkg "^1.0.0" @@ -7780,6 +8509,7 @@ read-pkg-up@^1.0.1: read-pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" + integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= dependencies: find-up "^2.0.0" read-pkg "^2.0.0" @@ -7787,6 +8517,7 @@ read-pkg-up@^2.0.0: read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= dependencies: find-up "^2.0.0" read-pkg "^3.0.0" @@ -7794,6 +8525,7 @@ read-pkg-up@^3.0.0: read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" + integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA== dependencies: find-up "^3.0.0" read-pkg "^3.0.0" @@ -7801,6 +8533,7 @@ read-pkg-up@^4.0.0: read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= dependencies: load-json-file "^1.0.0" normalize-package-data "^2.3.2" @@ -7809,6 +8542,7 @@ read-pkg@^1.0.0: read-pkg@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" + integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= dependencies: load-json-file "^2.0.0" normalize-package-data "^2.3.2" @@ -7817,28 +8551,33 @@ read-pkg@^2.0.0: read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= dependencies: load-json-file "^4.0.0" normalize-package-data "^2.3.2" path-type "^3.0.0" -read-pkg@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237" +read-pkg@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== dependencies: - normalize-package-data "^2.3.2" - parse-json "^4.0.0" - pify "^3.0.0" + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" read@1, read@~1.0.1: version "1.0.7" resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" + integrity sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ= dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" + integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -7848,36 +8587,45 @@ read@1, read@~1.0.1: string_decoder "~1.1.1" util-deprecate "~1.0.1" -"readable-stream@2 || 3", readable-stream@^3.0.2: - version "3.3.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.3.0.tgz#cb8011aad002eb717bf040291feba8569c986fb9" - integrity sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw== +"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6: + version "3.4.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" + integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" util-deprecate "^1.0.1" readdir-scoped-modules@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" + version "1.1.0" + resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" + integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== dependencies: debuglog "^1.0.1" dezalgo "^1.0.0" graceful-fs "^4.1.2" once "^1.3.0" -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" +readdirp@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" + integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" + graceful-fs "^4.1.11" + micromatch "^3.1.10" readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" + +readdirp@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.2.tgz#fa85d2d14d4289920e4671dead96431add2ee78a" + integrity sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw== + dependencies: + picomatch "^2.0.4" redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -7885,6 +8633,7 @@ redent@^1.0.0: redent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" + integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= dependencies: indent-string "^3.0.0" strip-indent "^2.0.0" @@ -7894,58 +8643,64 @@ reduce-flatten@^2.0.0: resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== -regenerate-unicode-properties@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c" +regenerate-unicode-properties@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" + integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== dependencies: regenerate "^1.4.0" regenerate@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" + integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== regenerator-runtime@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== -regenerator-transform@^0.13.3: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb" +regenerator-transform@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" + integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ== dependencies: private "^0.1.6" -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== dependencies: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexpp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365" +regexp-tree@^0.1.13, regexp-tree@~0.1.1: + version "0.1.13" + resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz#5b19ab9377edc68bc3679256840bb29afc158d7f" + integrity sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw== -regexpu-core@^4.1.3, regexpu-core@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.2.0.tgz#a3744fa03806cffe146dea4421a3e73bdcc47b1d" +regexpp@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" + integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== + +regexpu-core@^4.5.4: + version "4.6.0" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" + integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== dependencies: regenerate "^1.4.0" - regenerate-unicode-properties "^7.0.0" - regjsgen "^0.4.0" - regjsparser "^0.3.0" + regenerate-unicode-properties "^8.1.0" + regjsgen "^0.5.0" + regjsparser "^0.6.0" unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.0.2" + unicode-match-property-value-ecmascript "^1.1.0" registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" + version "3.4.0" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e" + integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A== dependencies: rc "^1.1.6" safe-buffer "^5.0.1" @@ -7953,6 +8708,7 @@ registry-auth-token@^3.0.1: registry-url@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" + integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI= dependencies: rc "^1.0.1" @@ -7963,41 +8719,44 @@ registry-url@^5.1.0: dependencies: rc "^1.2.8" -regjsgen@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.4.0.tgz#c1eb4c89a209263f8717c782591523913ede2561" +regjsgen@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd" + integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== -regjsparser@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.3.0.tgz#3c326da7fcfd69fa0d332575a41c8c0cdf588c96" +regjsparser@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" + integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ== dependencies: jsesc "~0.5.0" release-zalgo@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/release-zalgo/-/release-zalgo-1.0.0.tgz#09700b7e5074329739330e535c5a90fb67851730" + integrity sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA= dependencies: es6-error "^4.0.1" remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae" + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= dependencies: is-finite "^1.0.0" @@ -8030,39 +8789,39 @@ request@^2.87.0, request@^2.88.0: require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" + integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= -require-uncached@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" - dependencies: - caller-path "^0.1.0" - resolve-from "^1.0.0" +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" + integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= dependencies: resolve-from "^3.0.0" -resolve-from@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha1-six699nWiBvItuZTM17rywoYh0g= resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== resolve-from@^5.0.0: version "5.0.0" @@ -8072,27 +8831,24 @@ resolve-from@^5.0.0: resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.1.4, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" - dependencies: - path-parse "^1.0.5" - -restore-cursor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" +resolve@^1.1.4, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: + version "1.12.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6" + integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w== dependencies: - exit-hook "^1.0.0" - onetime "^1.0.0" + path-parse "^1.0.6" restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" + integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= dependencies: onetime "^2.0.0" signal-exit "^3.0.2" @@ -8100,26 +8856,48 @@ restore-cursor@^2.0.0: ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== retry@^0.10.0: version "0.10.1" resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4" + integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q= -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" +reusify@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rfdc@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" + integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== + +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== dependencies: - align-text "^0.1.1" + glob "^7.1.3" -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" +rimraf@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" + integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== dependencies: - glob "^7.0.5" + glob "^7.1.3" ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" + integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== dependencies: hash-base "^3.0.0" inherits "^2.0.1" @@ -8127,42 +8905,62 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: run-async@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" + integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= dependencies: is-promise "^2.1.0" run-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" + integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A== + +run-parallel@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" + integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" + integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= dependencies: aproba "^1.1.1" -rxjs@^6.1.0: - version "6.2.2" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9" +rxjs@^6.3.3, rxjs@^6.4.0: + version "6.5.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" + integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== dependencies: tslib "^1.9.0" -safe-buffer@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= dependencies: ret "~0.1.10" +safe-regex@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.0.2.tgz#3601b28d3aefe4b963d42f6c2cdb241265cbd63c" + integrity sha512-rRALJT0mh4qVFIJ9HvfjKDN77F9vp7kltOpFFI/8e6oKyHFmmxz4aSkY/YVauRDe7U0RrHdw9Lsxdel3E19s0A== + dependencies: + regexp-tree "~0.1.1" + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sax@>=0.6.0, sax@^1.2.4: version "1.2.4" @@ -8171,27 +8969,21 @@ sax@>=0.6.0, sax@^1.2.4: semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= semver-diff@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" + integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -"semver@2.x || 3.x || 4 || 5", semver@^5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477" - -semver@^5.6.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" - integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.2.0: +semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -8199,10 +8991,12 @@ semver@^6.0.0, semver@^6.2.0: semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" + integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= -send@0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== dependencies: debug "2.6.9" depd "~1.1.2" @@ -8211,59 +9005,47 @@ send@0.16.2: escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.4.0" + range-parser "~1.2.1" + statuses "~1.5.0" -serve-static@1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" - parseurl "~1.3.2" - send "0.16.2" + parseurl "~1.3.3" + send "0.17.1" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== dependencies: extend-shallow "^2.0.1" is-extendable "^0.1.1" is-plain-object "^2.0.3" split-string "^3.0.1" -setprototypeof@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" + integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" @@ -8275,6 +9057,7 @@ shallow-copy@0.0.1: shasum@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f" + integrity sha1-5wEjENj0F/TetXEhUOVni4euVl8= dependencies: json-stable-stringify "~0.0.0" sha.js "~2.4.4" @@ -8282,21 +9065,19 @@ shasum@^1.0.0: shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= dependencies: shebang-regex "^1.0.0" shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= shell-quote@^1.4.2, shell-quote@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767" - dependencies: - array-filter "~0.0.0" - array-map "~0.0.0" - array-reduce "~0.0.0" - jsonify "~0.0.0" + version "1.7.2" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" + integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== should-equal@^2.0.0: version "2.0.0" @@ -8339,6 +9120,7 @@ should@^13.2.3: signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" + integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= signale@^1.4.0: version "1.4.0" @@ -8352,36 +9134,51 @@ signale@^1.4.0: simple-concat@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6" + integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= slash@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" + integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== slice-ansi@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" + integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= -slice-ansi@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" slide@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" + integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= -smart-buffer@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3" +smart-buffer@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d" + integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw== snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== dependencies: define-property "^1.0.0" isobject "^3.0.0" @@ -8390,12 +9187,14 @@ snapdragon-node@^2.0.1: snapdragon-util@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== dependencies: kind-of "^3.2.0" snapdragon@^0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== dependencies: base "^0.11.1" debug "^2.2.0" @@ -8409,10 +9208,12 @@ snapdragon@^0.8.1: socket.io-adapter@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b" + integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs= socket.io-client@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f" + integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ== dependencies: backo2 "1.0.2" base64-arraybuffer "0.1.5" @@ -8432,6 +9233,7 @@ socket.io-client@2.1.1: socket.io-parser@~3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077" + integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA== dependencies: component-emitter "1.2.1" debug "~3.1.0" @@ -8440,6 +9242,7 @@ socket.io-parser@~3.2.0: socket.io@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980" + integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA== dependencies: debug "~3.1.0" engine.io "~3.2.0" @@ -8449,28 +9252,32 @@ socket.io@2.1.1: socket.io-parser "~3.2.0" socks-proxy-agent@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473" + version "4.0.2" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386" + integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg== dependencies: - agent-base "~4.2.0" - socks "~2.2.0" + agent-base "~4.2.1" + socks "~2.3.2" -socks@~2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9" +socks@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e" + integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ== dependencies: ip "^1.1.5" - smart-buffer "^4.0.1" + smart-buffer "4.0.2" sort-keys@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" + integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= dependencies: is-plain-obj "^1.0.0" source-map-resolve@^0.5.0: version "0.5.2" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" + integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== dependencies: atob "^2.1.1" decode-uri-component "^0.2.0" @@ -8478,6 +9285,14 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" +source-map-support@^0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-support@^0.5.6, source-map-support@^0.5.9: version "0.5.9" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" @@ -8488,24 +9303,22 @@ source-map-support@^0.5.6, source-map-support@^0.5.9: source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: +source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.3: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== spawn-wrap@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c" + version "1.4.3" + resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.3.tgz#81b7670e170cca247d80bf5faf0cfb713bdcf848" + integrity sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw== dependencies: foreground-child "^1.5.6" mkdirp "^0.5.0" @@ -8515,101 +9328,96 @@ spawn-wrap@^1.4.2: which "^1.3.0" spdx-correct@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" + version "3.1.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" + integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" + version "2.2.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" + integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== spdx-expression-parse@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" + integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== dependencies: extend-shallow "^3.0.0" split2@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" + integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== dependencies: through2 "^2.0.2" split@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== dependencies: through "2" sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sshpk@^1.7.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - safer-buffer "^2.0.2" - optionalDependencies: bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" ecc-jsbn "~0.1.1" + getpass "^0.1.1" jsbn "~0.1.0" + safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.0.tgz#fc21bfc90e03275ac3e23d5a42e38b8a1cbc130d" - -ssri@^6.0.1: +ssri@^6.0.0, ssri@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== dependencies: figgy-pudding "^3.5.1" -staged-git-files@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.1.tgz#37c2218ef0d6d26178b1310719309a16a59f8f7b" - static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= dependencies: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2": +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - -statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - -statuses@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= stream-browserify@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" + version "2.0.2" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" + integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== dependencies: inherits "~2.0.1" readable-stream "^2.0.2" @@ -8617,6 +9425,7 @@ stream-browserify@^2.0.0: stream-combiner2@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" + integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4= dependencies: duplexer2 "~0.1.0" readable-stream "^2.0.2" @@ -8624,47 +9433,54 @@ stream-combiner2@^1.1.1: stream-each@^1.1.0: version "1.2.3" resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" + integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== dependencies: end-of-stream "^1.1.0" stream-shift "^1.0.0" -stream-http@^2.0.0: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" +stream-http@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.1.0.tgz#22fb33fe9b4056b4eccf58bd8f400c4b993ffe57" + integrity sha512-cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw== dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" + readable-stream "^3.0.6" xtend "^4.0.0" stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" + integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= stream-splicer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83" + version "2.0.1" + resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.1.tgz#0b13b7ee2b5ac7e0609a7463d83899589a363fcd" + integrity sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg== dependencies: inherits "^2.0.1" readable-stream "^2.0.2" -streamroller@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b" +streamroller@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9" + integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg== dependencies: - date-format "^1.2.0" - debug "^3.1.0" - mkdirp "^0.5.1" - readable-stream "^2.3.0" + async "^2.6.2" + date-format "^2.0.0" + debug "^3.2.6" + fs-extra "^7.0.1" + lodash "^4.17.14" -string-argv@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736" +string-argv@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" @@ -8673,77 +9489,138 @@ string-width@^1.0.1: "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== dependencies: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + string.prototype.padend@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" + integrity sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA= dependencies: define-properties "^1.1.2" es-abstract "^1.4.3" function-bind "^1.0.2" -string_decoder@^1.1.1, string_decoder@~1.1.1: +string.prototype.trimleft@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" + integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + +string.prototype.trimright@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" + integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== + dependencies: + define-properties "^1.1.3" + function-bind "^1.1.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== dependencies: safe-buffer "~5.1.0" -stringify-object@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd" +stringify-object@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== dependencies: - get-own-enumerable-property-symbols "^2.0.1" + get-own-enumerable-property-symbols "^3.0.0" is-obj "^1.0.1" is-regexp "^1.0.0" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= dependencies: ansi-regex "^3.0.0" +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= dependencies: is-utf8 "^0.2.0" strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" strip-indent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" + integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= -strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: +strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +strip-json-comments@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" + integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== strong-log-transformer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.0.0.tgz#fa6d8e0a9e62b3c168c3cad5ae5d00dc97ba26cc" + version "2.1.0" + resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" + integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA== dependencies: - byline "^5.0.0" duplexer "^0.1.1" minimist "^1.2.0" through "^2.3.4" @@ -8751,32 +9628,53 @@ strong-log-transformer@^2.0.0: subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" + integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI= dependencies: minimist "^1.1.0" -supports-color@5.4.0, supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" +supports-color@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a" + integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg== dependencies: has-flag "^3.0.0" supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^5.4.0: +supports-color@^5.0.0, supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== dependencies: has-flag "^3.0.0" +supports-hyperlinks@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7" + integrity sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw== + dependencies: + has-flag "^2.0.0" + supports-color "^5.0.0" + symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== syntax-error@^1.1.1: version "1.4.0" resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.4.0.tgz#2d9d4ff5c064acb711594a3e3b95054ad51d907c" + integrity sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w== dependencies: acorn-node "^1.2.0" @@ -8790,62 +9688,43 @@ table-layout@^1.0.0: typical "^5.0.0" wordwrapjs "^4.0.0" -table@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc" +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== dependencies: - ajv "^6.0.1" - ajv-keywords "^3.0.0" - chalk "^2.1.0" - lodash "^4.17.4" - slice-ansi "1.0.0" - string-width "^2.1.1" + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" tapable@^2.0.0-beta.2: version "2.0.0-beta.8" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.0.0-beta.8.tgz#0a8d42f6895d43d5a895de15d9a9e3e425f72a0a" integrity sha512-7qMajFcHb2O+aWufLoAvKhEehIwikXUTH1s8RP4R5gSYMIB0Tmypp+J90EtSNVbIlI7oB0Oz8ZlpJUJlZ5owxQ== -tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -tar@^4: - version "4.4.4" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd" - dependencies: - chownr "^1.0.1" - fs-minipass "^1.2.5" - minipass "^2.3.3" - minizlib "^1.1.0" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.2" - -tar@^4.4.8: - version "4.4.8" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d" - integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ== +tar@^4, tar@^4.4.10, tar@^4.4.8: + version "4.4.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.11.tgz#7ac09801445a3cf74445ed27499136b5240ffb73" + integrity sha512-iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA== dependencies: chownr "^1.1.1" fs-minipass "^1.2.5" - minipass "^2.3.4" - minizlib "^1.1.1" + minipass "^2.6.4" + minizlib "^1.2.1" mkdirp "^0.5.0" safe-buffer "^5.1.2" - yallist "^3.0.2" + yallist "^3.0.3" temp-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= temp-write@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-3.4.0.tgz#8cff630fb7e9da05f047c74ce4ce4d685457d492" + integrity sha1-jP9jD7fp2gXwR8dM5M5NaFRX1JI= dependencies: graceful-fs "^4.1.2" is-stream "^1.1.0" @@ -8857,25 +9736,29 @@ temp-write@^3.4.0: term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" + integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk= dependencies: execa "^0.7.0" -test-exclude@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.0.0.tgz#cdce7cece785e0e829cd5c2b27baf18bc583cfb7" +test-exclude@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" + integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g== dependencies: - arrify "^1.0.1" + glob "^7.1.3" minimatch "^3.0.4" read-pkg-up "^4.0.0" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" -text-extensions@^1.0.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39" +text-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6" + integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ== text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= tfilter@^1.0.1: version "1.0.1" @@ -8889,24 +9772,28 @@ tfilter@^1.0.1: the-argv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/the-argv/-/the-argv-1.0.0.tgz#0084705005730dd84db755253c931ae398db9522" + integrity sha1-AIRwUAVzDdhNt1UlPJMa45jblSI= thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" + integrity sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= dependencies: thenify ">= 3.1.0 < 4" "thenify@>= 3.1.0 < 4": version "3.3.0" resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839" + integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= dependencies: any-promise "^1.0.0" through2@^2.0.0, through2@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== dependencies: - readable-stream "^2.1.5" + readable-stream "~2.3.6" xtend "~4.0.1" through2@^3.0.0: @@ -8923,10 +9810,12 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@~2.3.4: timed-out@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" + integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= timers-browserify@^1.0.1: version "1.4.2" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" + integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0= dependencies: process "~0.11.0" @@ -8937,50 +9826,66 @@ timm@^1.6.1: tinycolor2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" + integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g= tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== dependencies: os-tmpdir "~1.0.2" to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" + integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= dependencies: kind-of "^3.0.2" to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= dependencies: is-number "^3.0.0" repeat-string "^1.6.1" +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== dependencies: define-property "^2.0.2" extend-shallow "^3.0.2" regex-not "^1.0.2" safe-regex "^1.1.0" +toidentifier@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== + tough-cookie@~2.4.3: version "2.4.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" + integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== dependencies: psl "^1.1.24" punycode "^1.4.1" @@ -8988,24 +9893,29 @@ tough-cookie@~2.4.3: tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" + integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= dependencies: punycode "^2.1.0" trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= trim-newlines@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" + integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= trim-off-newlines@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" + integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" + integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= trim@0.0.1: version "0.0.1" @@ -9014,6 +9924,7 @@ trim@0.0.1: ts-node@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-7.0.1.tgz#9562dc2d1e6d248d24bc55f773e3f614337d9baf" + integrity sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw== dependencies: arrify "^1.0.0" buffer-from "^1.1.0" @@ -9024,15 +9935,11 @@ ts-node@^7.0.1: source-map-support "^0.5.6" yn "^2.0.0" -tslib@^1.8.0, tslib@^1.8.1: +tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslib@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - tslint@5.14.0: version "5.14.0" resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e" @@ -9062,33 +9969,49 @@ tsutils@^2.29.0: tty-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" + integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw== tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= dependencies: prelude-ls "~1.1.2" -type-is@~1.6.15, type-is@~1.6.16: - version "1.6.16" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" +type-fest@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" + integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-is@~1.6.17, type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== dependencies: media-typer "0.3.0" - mime-types "~2.1.18" + mime-types "~2.1.24" typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript-memoize@^1.0.0-alpha.3: version "1.0.0-alpha.3" @@ -9103,9 +10026,9 @@ typescript@^3.1.3: integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw== typescript@next: - version "3.7.0-dev.20190907" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20190907.tgz#6952fcfe58ba14ad2fa16749d90f7bb4138aa992" - integrity sha512-zUtlsa6sFacCu4sFMWu8/6CmjRthT+8+8sMUAGQxHWLWO9KDeGoL3MfMygUlffN9l7GnDwqNamu0M9pHgHXlFw== + version "3.7.0-dev.20190920" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.0-dev.20190920.tgz#21d3fdc378245199542c238eaf6c6db7e7e775c5" + integrity sha512-/DTQzLSdOAHewW+toV7Wt1KYj3Gg9w7ZRHMuKXEE57yUHLBpoAiAJ6o2QxJxjP9dDbNKnaMOc7yaIWWfCSxJJA== typical@^4.0.0: version "4.0.0" @@ -9117,55 +10040,41 @@ typical@^5.0.0, typical@^5.1.0: resolved "https://registry.yarnpkg.com/typical/-/typical-5.1.0.tgz#7116ca103caf2574985fc84fbaa8fd0ee5ea1684" integrity sha512-t5Ik8UAwBal1P1XzuVE4dc+RYQZicLUGJdvqr/vdqsED7SQECgsGBylldSsfWZL7RQjxT3xhQcKHWhLaVSR6YQ== -uglify-js@^2.6: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-js@^3.1.4: - version "3.5.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.9.tgz#372fbf95939555b1f460b1777d33a67d4a994ac9" - integrity sha512-WpT0RqsDtAWPNJK955DEnb6xjymR8Fn0OlK4TT4pS0ASYsVPqr5ELhgwOwLCP5J5vHeJ4xmMmz3DEgdqC10JeQ== +uglify-js@^3.1.4, uglify-js@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5" + integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg== dependencies: commander "~2.20.0" source-map "~0.6.1" -uglify-js@^3.4.9: - version "3.4.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3" - dependencies: - commander "~2.17.1" - source-map "~0.6.1" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - uid-number@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" + integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= ultron@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" + integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== umask@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" + integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0= umd@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" + integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow== undeclared-identifiers@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz#7d850a98887cff4bd0bf64999c014d08ed6d1acc" + version "1.1.3" + resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz#9254c1d37bdac0ac2b52de4b6722792d2a91e30f" + integrity sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw== dependencies: acorn-node "^1.3.0" + dash-ast "^1.0.0" get-assigned-identifiers "^1.2.0" simple-concat "^1.0.0" xtend "^4.0.1" @@ -9173,36 +10082,35 @@ undeclared-identifiers@^1.1.2: unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" + integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== unicode-match-property-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" + integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== dependencies: unicode-canonical-property-names-ecmascript "^1.0.4" unicode-property-aliases-ecmascript "^1.0.4" -unicode-match-property-value-ecmascript@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4" +unicode-match-property-value-ecmascript@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" + integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0" + version "1.0.5" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" + integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== dependencies: arr-union "^3.1.0" get-value "^2.0.6" is-extendable "^0.1.1" - set-value "^0.4.3" - -unique-filename@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3" - dependencies: - unique-slug "^2.0.0" + set-value "^2.0.1" unique-filename@^1.1.1: version "1.1.1" @@ -9212,24 +10120,19 @@ unique-filename@^1.1.1: unique-slug "^2.0.0" unique-slug@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab" + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== dependencies: imurmurhash "^0.1.4" unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= dependencies: crypto-random-string "^1.0.0" -universal-user-agent@^2.0.0, universal-user-agent@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c" - integrity sha512-eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g== - dependencies: - os-name "^3.0.0" - universal-user-agent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-3.0.0.tgz#4cc88d68097bffd7ac42e3b7c903e7481424b4b9" @@ -9237,17 +10140,27 @@ universal-user-agent@^3.0.0: dependencies: os-name "^3.0.0" +universal-user-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-4.0.0.tgz#27da2ec87e32769619f68a14996465ea1cb9df16" + integrity sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA== + dependencies: + os-name "^3.1.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= dependencies: has-value "^0.3.1" isobject "^3.0.0" @@ -9255,10 +10168,12 @@ unset-value@^1.0.0: unzip-response@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" + integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= -upath@^1.0.5: - version "1.1.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd" +upath@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" + integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== update-notifier@^2.3.0: version "2.5.0" @@ -9276,15 +10191,17 @@ update-notifier@^2.3.0: semver-diff "^2.0.0" xdg-basedir "^3.0.0" -uri-js@^4.2.1, uri-js@^4.2.2: +uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" + integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== dependencies: punycode "^2.1.0" urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= url-join@^4.0.0: version "4.0.1" @@ -9294,6 +10211,7 @@ url-join@^4.0.0: url-parse-lax@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" + integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= dependencies: prepend-http "^1.0.1" @@ -9305,6 +10223,7 @@ url-template@^2.0.8: url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= dependencies: punycode "1.3.2" querystring "0.2.0" @@ -9312,6 +10231,7 @@ url@~0.11.0: use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== user-home@^2.0.0: version "2.0.0" @@ -9320,11 +10240,12 @@ user-home@^2.0.0: dependencies: os-homedir "^1.0.0" -useragent@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e" +useragent@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972" + integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw== dependencies: - lru-cache "2.2.x" + lru-cache "4.1.x" tmp "0.0.x" utif@^2.0.1: @@ -9336,37 +10257,48 @@ utif@^2.0.1: util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +util-promisify@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53" + integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM= + dependencies: + object.getownpropertydescriptors "^2.0.3" util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" + integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= dependencies: inherits "2.0.1" util@~0.10.1: version "0.10.4" resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" + integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== dependencies: inherits "2.0.3" utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@^3.0.1, uuid@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" + version "3.3.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" + integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== -validate-npm-package-license@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" +v8-compile-cache@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" + integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== -validate-npm-package-license@^3.0.3: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== dependencies: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" @@ -9374,16 +10306,19 @@ validate-npm-package-license@^3.0.3: validate-npm-package-name@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" + integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= dependencies: builtins "^1.0.3" vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -9392,18 +10327,21 @@ verror@1.10.0: vm-browserify@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" + integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw== void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" + integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= -watchify@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.0.tgz#03f1355c643955e7ab8dcbf399f624644221330f" +watchify@^3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/watchify/-/watchify-3.11.1.tgz#8e4665871fff1ef64c0430d1a2c9d084d9721881" + integrity sha512-WwnUClyFNRMB2NIiHgJU9RQPQNqVeFk7OmZaWf5dC5EnNa0Mgr7imBydbaJ7tGTuPM2hz1Cb4uiBvK9NVxMfog== dependencies: - anymatch "^1.3.0" + anymatch "^2.0.0" browserify "^16.1.0" - chokidar "^1.0.0" + chokidar "^2.1.1" defined "^1.0.0" outpipe "^1.1.0" through2 "^2.0.0" @@ -9412,16 +10350,19 @@ watchify@^3.11.0: wcwidth@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= dependencies: defaults "^1.0.3" webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== whatwg-url@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" + integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ== dependencies: lodash.sortby "^4.7.0" tr46 "^1.0.1" @@ -9430,29 +10371,29 @@ whatwg-url@^7.0.0: which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@1, which@1.3.1, which@^1.2.1, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== dependencies: isexe "^2.0.0" -wide-align@^1.1.0: +wide-align@1.1.3, wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== dependencies: string-width "^1.0.2 || 2" widest-line@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273" + version "2.0.1" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc" + integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA== dependencies: string-width "^2.1.1" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - windows-release@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" @@ -9460,17 +10401,15 @@ windows-release@^3.1.0: dependencies: execa "^1.0.0" -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" + integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= wordwrapjs@^4.0.0: version "4.0.0" @@ -9483,25 +10422,46 @@ wordwrapjs@^4.0.0: wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" + integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= dependencies: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" + integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= + dependencies: + string-width "^2.1.1" + strip-ansi "^4.0.0" + +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" +write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2: + version "2.4.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" + integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== dependencies: graceful-fs "^4.1.11" imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-json-file@^2.2.0, write-json-file@^2.3.0: +write-json-file@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" + integrity sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8= dependencies: detect-indent "^5.0.0" graceful-fs "^4.1.2" @@ -9510,22 +10470,37 @@ write-json-file@^2.2.0, write-json-file@^2.3.0: sort-keys "^2.0.0" write-file-atomic "^2.0.0" +write-json-file@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a" + integrity sha512-3xZqT7Byc2uORAatYiP3DHUUAVEkNOswEWNs9H5KXiicRTvzYzYqKjYc4G7p+8pltvAw641lVByKVtMpf+4sYQ== + dependencies: + detect-indent "^5.0.0" + graceful-fs "^4.1.15" + make-dir "^2.1.0" + pify "^4.0.1" + sort-keys "^2.0.0" + write-file-atomic "^2.4.2" + write-pkg@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.2.0.tgz#0e178fe97820d389a8928bc79535dbe68c2cff21" + integrity sha512-tX2ifZ0YqEFOF1wjRW2Pk93NLsj02+n1UP5RvO6rCs0K6R2g1padvf006cY74PQJKMGS2r42NK7FD0dG6Y6paw== dependencies: sort-keys "^2.0.0" write-json-file "^2.2.0" -write@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" +write@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" + integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== dependencies: mkdirp "^0.5.1" ws@~3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" + integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA== dependencies: async-limiter "~1.0.0" safe-buffer "~5.1.0" @@ -9534,6 +10509,7 @@ ws@~3.3.1: xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" + integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= xhr@^2.0.1: version "2.5.0" @@ -9562,10 +10538,12 @@ xmlbuilder@~9.0.1: xmlhttprequest-ssl@~1.5.4: version "1.5.5" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e" + integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= xo-init@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/xo-init/-/xo-init-0.7.0.tgz#634b4789e366b4f87f747ef0cee1a99ce273aa15" + integrity sha512-mrrCKMu52vz0u2tiOl8DoG709pBtnSp58bb4/j58a4jeXjrb1gV7dxfOBjOlXitYtfW2QnlxxxfAojoFcpynDg== dependencies: arrify "^1.0.0" execa "^0.9.0" @@ -9576,34 +10554,37 @@ xo-init@^0.7.0: the-argv "^1.0.0" write-pkg "^3.1.0" -xo@^0.23.0: - version "0.23.0" - resolved "https://registry.yarnpkg.com/xo/-/xo-0.23.0.tgz#dbc709b0e5e38060a497a39d147a173ddd36d355" +xo@^0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/xo/-/xo-0.24.0.tgz#f931ff453f3440919d51da908591371e8ed714e0" + integrity sha512-eaXWpNtXHbJ+DSiDkdRnDcMYPeUi/MWFUoUgorBhzAueTCM+v4o9Xv6buYgyoL4r7JuTp5EWXx3lGn9Md4dgWA== dependencies: arrify "^1.0.1" - debug "^3.1.0" - eslint "^5.5.0" - eslint-config-prettier "^3.0.1" - eslint-config-xo "^0.25.0" - eslint-formatter-pretty "^1.3.0" + debug "^4.1.0" + eslint "^5.12.0" + eslint-config-prettier "^3.3.0" + eslint-config-xo "^0.26.0" + eslint-formatter-pretty "^2.0.0" eslint-plugin-ava "^5.1.0" + eslint-plugin-eslint-comments "^3.0.1" eslint-plugin-import "^2.14.0" - eslint-plugin-no-use-extend-native "^0.3.12" - eslint-plugin-node "^7.0.0" - eslint-plugin-prettier "^2.6.0" + eslint-plugin-no-use-extend-native "^0.4.0" + eslint-plugin-node "^8.0.0" + eslint-plugin-prettier "^3.0.0" eslint-plugin-promise "^4.0.0" - eslint-plugin-unicorn "^6.0.1" + eslint-plugin-unicorn "^7.0.0" + find-cache-dir "^2.0.0" get-stdin "^6.0.0" - globby "^8.0.0" + globby "^9.0.0" has-flag "^3.0.0" lodash.isequal "^4.5.0" lodash.mergewith "^4.6.1" meow "^5.0.0" - multimatch "^2.1.0" + multimatch "^3.0.0" open-editor "^1.2.0" path-exists "^3.0.0" pkg-conf "^2.1.0" - prettier "^1.12.1" + prettier "^1.15.2" resolve-cwd "^2.0.0" resolve-from "^4.0.0" semver "^5.5.0" @@ -9614,30 +10595,45 @@ xo@^0.23.0: xregexp@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" + integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg== -xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" + integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" + integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" + integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== + +yargs-parser@13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b" + integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" yargs-parser@^10.0.0, yargs-parser@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ== dependencies: camelcase "^4.1.0" @@ -9649,21 +10645,58 @@ yargs-parser@^11.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^13.0.0, yargs-parser@^13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" + integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== dependencies: camelcase "^4.1.0" yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" + integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc= dependencies: camelcase "^4.1.0" -yargs@11.1.0, yargs@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" +yargs-unparser@1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.5.0.tgz#f2bb2a7e83cbc87bb95c8e572828a06c9add6e0d" + integrity sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw== + dependencies: + flat "^4.1.0" + lodash "^4.17.11" + yargs "^12.0.5" + +yargs@13.2.2: + version "13.2.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993" + integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA== + dependencies: + cliui "^4.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.0.0" + +yargs@^10.0.3: + version "10.1.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" + integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== dependencies: cliui "^4.0.0" decamelize "^1.1.1" @@ -9676,11 +10709,12 @@ yargs@11.1.0, yargs@^11.0.0: string-width "^2.0.0" which-module "^2.0.0" y18n "^3.2.1" - yargs-parser "^9.0.2" + yargs-parser "^8.1.0" -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" +yargs@^11.0.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" + integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A== dependencies: cliui "^4.0.0" decamelize "^1.1.1" @@ -9693,24 +10727,25 @@ yargs@^10.0.3: string-width "^2.0.0" which-module "^2.0.0" y18n "^3.2.1" - yargs-parser "^8.1.0" + yargs-parser "^9.0.2" -yargs@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2" +yargs@^12.0.1, yargs@^12.0.5: + version "12.0.5" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" + integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== dependencies: cliui "^4.0.0" - decamelize "^2.0.0" + decamelize "^1.2.0" find-up "^3.0.0" get-caller-file "^1.0.1" - os-locale "^2.0.0" + os-locale "^3.0.0" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" string-width "^2.0.0" which-module "^2.0.0" y18n "^3.2.1 || ^4.0.0" - yargs-parser "^10.1.0" + yargs-parser "^11.1.1" yargs@^12.0.2: version "12.0.2" @@ -9729,37 +10764,28 @@ yargs@^12.0.2: y18n "^3.2.1 || ^4.0.0" yargs-parser "^10.1.0" -yargs@^12.0.5: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== +yargs@^13.2.2: + version "13.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" + integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== dependencies: - cliui "^4.0.0" - decamelize "^1.2.0" + cliui "^5.0.0" find-up "^3.0.0" - get-caller-file "^1.0.1" - os-locale "^3.0.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^2.0.0" + string-width "^3.0.0" which-module "^2.0.0" - y18n "^3.2.1 || ^4.0.0" - yargs-parser "^11.1.1" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" + y18n "^4.0.0" + yargs-parser "^13.1.1" yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" + integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= yn@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" + integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= From 0356849e69a69c1b13ccd57fb55380aa76d51f4c Mon Sep 17 00:00:00 2001 From: popinguy Date: Fri, 18 Oct 2019 23:43:46 +0300 Subject: [PATCH 021/223] Image dimensions during exif rotation have been corrected (#791) --- packages/core/src/utils/image-bitmap.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/utils/image-bitmap.js b/packages/core/src/utils/image-bitmap.js index 98fee1bec..7b51e0214 100644 --- a/packages/core/src/utils/image-bitmap.js +++ b/packages/core/src/utils/image-bitmap.js @@ -27,7 +27,7 @@ function getMIMEFromBuffer(buffer, path) { /* * Automagically rotates an image based on its EXIF data (if present) * @param img a constants object -*/ + */ function exifRotate(img) { const exif = img._exif; @@ -40,22 +40,22 @@ function exifRotate(img) { img.mirror(true, false); break; case 3: // Rotate 180 - img.rotate(180, false); + img.rotate(180); break; case 4: // Mirror vertical img.mirror(false, true); break; case 5: // Mirror horizontal and rotate 270 CW - img.rotate(-90, false).mirror(true, false); + img.rotate(-90).mirror(true, false); break; case 6: // Rotate 90 CW - img.rotate(-90, false); + img.rotate(-90); break; case 7: // Mirror horizontal and rotate 90 CW - img.rotate(90, false).mirror(true, false); + img.rotate(90).mirror(true, false); break; case 8: // Rotate 270 CW - img.rotate(-270, false); + img.rotate(-270); break; default: break; From 7aa3c2a5686428eb3a06edc2489cae5ea6c202e6 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 18 Oct 2019 20:51:58 +0000 Subject: [PATCH 022/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a84e34e8..6e83cc0da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +# v0.8.5 (Fri Oct 18 2019) + +#### 🐛 Bug Fix + +- `@jimp/core` + - Image dimensions during exif rotation have been corrected [#791](https://github.com/oliver-moran/jimp/pull/791) (alexander.shcherbakov@btsdigital.kz [@popinguy](https://github.com/popinguy)) + +#### 🏠 Internal + +- `@jimp/cli`, `@jimp/core`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-color`, `@jimp/plugin-crop`, `@jimp/plugin-normalize`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/test-utils`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types` + - Upgrade nearly-all dev deps [#799](https://github.com/oliver-moran/jimp/pull/799) ([@popinguy](https://github.com/popinguy) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### 📝 Documentation + +- Added back mention of required tsconfig options [#800](https://github.com/oliver-moran/jimp/pull/800) ([@popinguy](https://github.com/popinguy)) + +#### Authors: 3 + +- [@popinguy](https://github.com/popinguy) +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Alexander Shcherbakov (alexander.shcherbakov@btsdigital.kz) + +--- + # v0.8.4 (Fri Sep 20 2019) #### 🐛 Bug Fix From 60b635dd77b6ea900043d81d09a12ff82fd14fd0 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 18 Oct 2019 20:52:00 +0000 Subject: [PATCH 023/223] Bump version to: 0.8.5 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index be33ce2f7..07a9eb1fc 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.8.4" + "version": "0.8.5" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 799053a0c..6202e19f0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.8.4", + "version": "0.8.5", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.4", + "@jimp/custom": "^0.8.5", "chalk": "^2.4.1", - "jimp": "^0.8.4", + "jimp": "^0.8.5", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index b21b67041..0a033f622 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.8.4", + "version": "0.8.5", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -34,7 +34,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index 66ce33536..b1015d2eb 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.8.4", + "version": "0.8.5", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.8.4", + "@jimp/core": "^0.8.5", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index d66c08095..8512785a2 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.8.4", + "version": "0.8.5", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -59,9 +59,9 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/plugins": "^0.8.4", - "@jimp/types": "^0.8.4", + "@jimp/custom": "^0.8.5", + "@jimp/plugins": "^0.8.5", + "@jimp/types": "^0.8.5", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, @@ -72,7 +72,7 @@ "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.6.0", "@babel/register": "^7.6.0", - "@jimp/test-utils": "^0.8.4", + "@jimp/test-utils": "^0.8.5", "auto": "^7.6.0", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 97c1dddb1..6387f57aa 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.8.4", + "version": "0.8.5", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/jpeg": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/jpeg": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 36f888914..11118dcc6 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.8.4", + "version": "0.8.5", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index d816d5c16..0c412a9f0 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.8.4", + "version": "0.8.5", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 174583cd8..a85c3b9aa 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.8.4", + "version": "0.8.5", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4", - "@jimp/types": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5", + "@jimp/types": "^0.8.5" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 28245f437..bd2fb6ab0 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.8.4", + "version": "0.8.5", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/plugin-blit": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/plugin-scale": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/plugin-blit": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/plugin-scale": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 2d753c7c4..183790c78 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.8.4", + "version": "0.8.5", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/plugin-crop": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/plugin-scale": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/plugin-crop": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/plugin-scale": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 7ed15019c..ecfd9d33e 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.8.4", + "version": "0.8.5", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index d9d96f2ac..7e055c2a9 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.8.4", + "version": "0.8.5", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index ca0a7a61f..4ba6853ce 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.8.4", + "version": "0.8.5", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index c2f14f61d..198100310 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.8.4", + "version": "0.8.5", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index c86c0c3c6..880be4951 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.8.4", + "version": "0.8.5", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 07808f431..7d458b35c 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.8.4", + "version": "0.8.5", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 446e53c09..6651bd919 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.8.4", + "version": "0.8.5", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index ffca9d079..5bf525064 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.8.4", + "version": "0.8.5", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 3dc886c11..d34e22702 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.8.4", + "version": "0.8.5", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index d00da5819..410a4eae4 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.8.4", + "version": "0.8.5", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/plugin-blit": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/plugin-blit": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index e0cc81395..615fdb940 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.8.4", + "version": "0.8.5", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index a2935d9f9..abbf6b496 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.8.4", + "version": "0.8.5", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/plugin-blit": "^0.8.4", - "@jimp/plugin-crop": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/plugin-blit": "^0.8.5", + "@jimp/plugin-crop": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 8aea39137..ac7bf5b5e 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.8.4", + "version": "0.8.5", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 517dbd743..f7c3dca1e 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.8.4", + "version": "0.8.5", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/plugin-blur": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/plugin-blur": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 298a2d53a..576b38372 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.8.4", + "version": "0.8.5", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/jpeg": "^0.8.4", - "@jimp/plugin-color": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/jpeg": "^0.8.5", + "@jimp/plugin-color": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index dc702e1e0..2081b2ae0 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.8.4", - "@jimp/plugin-blur": "^0.8.4", - "@jimp/plugin-color": "^0.8.4", - "@jimp/plugin-contain": "^0.8.4", - "@jimp/plugin-cover": "^0.8.4", - "@jimp/plugin-crop": "^0.8.4", - "@jimp/plugin-displace": "^0.8.4", - "@jimp/plugin-dither": "^0.8.4", - "@jimp/plugin-flip": "^0.8.4", - "@jimp/plugin-gaussian": "^0.8.4", - "@jimp/plugin-invert": "^0.8.4", - "@jimp/plugin-mask": "^0.8.4", - "@jimp/plugin-normalize": "^0.8.4", - "@jimp/plugin-print": "^0.8.4", - "@jimp/plugin-resize": "^0.8.4", - "@jimp/plugin-rotate": "^0.8.4", - "@jimp/plugin-scale": "^0.8.4", + "@jimp/plugin-blit": "^0.8.5", + "@jimp/plugin-blur": "^0.8.5", + "@jimp/plugin-color": "^0.8.5", + "@jimp/plugin-contain": "^0.8.5", + "@jimp/plugin-cover": "^0.8.5", + "@jimp/plugin-crop": "^0.8.5", + "@jimp/plugin-displace": "^0.8.5", + "@jimp/plugin-dither": "^0.8.5", + "@jimp/plugin-flip": "^0.8.5", + "@jimp/plugin-gaussian": "^0.8.5", + "@jimp/plugin-invert": "^0.8.5", + "@jimp/plugin-mask": "^0.8.5", + "@jimp/plugin-normalize": "^0.8.5", + "@jimp/plugin-print": "^0.8.5", + "@jimp/plugin-resize": "^0.8.5", + "@jimp/plugin-rotate": "^0.8.5", + "@jimp/plugin-scale": "^0.8.5", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 04043746d..ebfe3e4c0 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.8.4", + "version": "0.8.5", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.8.4", + "@jimp/custom": "^0.8.5", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index cd839c10f..c8ea221f8 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 7504eb72f..6b9aba84d 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 468a19edb..d3fa22f7b 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 41159e91d..a1e2ccf5b 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.4", + "@jimp/utils": "^0.8.5", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 6ec411082..101272e6d 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.4", - "@jimp/test-utils": "^0.8.4" + "@jimp/custom": "^0.8.5", + "@jimp/test-utils": "^0.8.5" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index cc2ff5423..71279fc4c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.8.4", + "version": "0.8.5", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.8.4", - "@jimp/gif": "^0.8.4", - "@jimp/jpeg": "^0.8.4", - "@jimp/png": "^0.8.4", - "@jimp/tiff": "^0.8.4", + "@jimp/bmp": "^0.8.5", + "@jimp/gif": "^0.8.5", + "@jimp/jpeg": "^0.8.5", + "@jimp/png": "^0.8.5", + "@jimp/tiff": "^0.8.5", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 62ea908e4..cd3914722 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.8.4", + "version": "0.8.5", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From f5d5167ea6944f3609ec8a72afb1d7cd40f46339 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Tue, 26 Nov 2019 09:00:15 -0800 Subject: [PATCH 024/223] Revert exports to match 0.6.4 TS definitions (#820) --- packages/jimp/types/index.d.ts | 16 ++++++++-------- packages/jimp/types/test.ts | 2 +- packages/jimp/types/ts3.1/index.d.ts | 6 +----- packages/jimp/types/ts3.1/test.ts | 2 +- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts index 8fd0aea61..32d0e4224 100644 --- a/packages/jimp/types/index.d.ts +++ b/packages/jimp/types/index.d.ts @@ -3,7 +3,7 @@ declare const DepreciatedJimp: DepreciatedJimp; -export default DepreciatedJimp; +export = DepreciatedJimp; /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version @@ -500,7 +500,7 @@ type URLOptions = { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface Bitmap { +interface Bitmap { data: Buffer; width: number; height: number; @@ -508,7 +508,7 @@ export interface Bitmap { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface RGB { +interface RGB { r: number; g: number; b: number; @@ -517,7 +517,7 @@ export interface RGB { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface RGBA { +interface RGBA { r: number; g: number; b: number; @@ -527,7 +527,7 @@ export interface RGBA { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface FontChar { +interface FontChar { id: number; x: number; y: number; @@ -543,7 +543,7 @@ export interface FontChar { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface FontInfo { +interface FontInfo { face: string; size: number; bold: number; @@ -560,7 +560,7 @@ export interface FontInfo { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface FontCommon { +interface FontCommon { lineHeight: number; base: number; scaleW: number; @@ -576,7 +576,7 @@ export interface FontCommon { /** * @deprecated Jimp typings for TS <3.1 are being depreciated. Please upgrade your TypeScript version */ -export interface Font { +interface Font { chars: { [char: string]: FontChar; }; diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts index 93d76dff9..54d5a3dc7 100644 --- a/packages/jimp/types/test.ts +++ b/packages/jimp/types/test.ts @@ -1,4 +1,4 @@ -import Jimp from 'jimp'; +import * as Jimp from 'jimp'; const jimpInst: Jimp = new Jimp('test'); diff --git a/packages/jimp/types/ts3.1/index.d.ts b/packages/jimp/types/ts3.1/index.d.ts index a619e00af..a537710d5 100644 --- a/packages/jimp/types/ts3.1/index.d.ts +++ b/packages/jimp/types/ts3.1/index.d.ts @@ -20,10 +20,6 @@ import pluginFn from '@jimp/plugins'; type Types = ReturnType; type Plugins = ReturnType; -export { Bitmap, RGB, RGBA }; - -export { FontChar, FontInfo, FontCommon, Font } from '@jimp/plugin-print'; - type IntersectedPluginTypes = UnionToIntersection< GetPluginVal | GetPluginVal >; @@ -32,4 +28,4 @@ type Jimp = InstanceType & IntersectedPluginTypes; declare const Jimp: JimpConstructors & Jimp; -export default Jimp; +export = Jimp; diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts index 8a3a271b2..dbec3103f 100644 --- a/packages/jimp/types/ts3.1/test.ts +++ b/packages/jimp/types/ts3.1/test.ts @@ -1,4 +1,4 @@ -import Jimp from 'jimp'; +import * as Jimp from 'jimp'; const jimpInst: Jimp = new Jimp('test'); From b1e36494c0a546ab1752a6dcd0c71bb826895dc8 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 17:07:19 +0000 Subject: [PATCH 025/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e83cc0da..9fe456376 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.9.0 (Tue Nov 26 2019) + +#### 🚀 Enhancement + +- `jimp` + - Revert exports to match 0.6.4 TS definitions [#820](https://github.com/oliver-moran/jimp/pull/820) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.8.5 (Fri Oct 18 2019) #### 🐛 Bug Fix From 0591e7391f64a92084a4ce9c96a1274df6339c25 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 17:07:21 +0000 Subject: [PATCH 026/223] Bump version to: 0.9.0 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index 07a9eb1fc..e82f2edf1 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.8.5" + "version": "0.9.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 6202e19f0..f50052fb7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.8.5", + "version": "0.9.0", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.5", + "@jimp/custom": "^0.9.0", "chalk": "^2.4.1", - "jimp": "^0.8.5", + "jimp": "^0.9.0", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 0a033f622..e087e9574 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.8.5", + "version": "0.9.0", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -34,7 +34,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index b1015d2eb..357d1a285 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.8.5", + "version": "0.9.0", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.8.5", + "@jimp/core": "^0.9.0", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 8512785a2..ed03d33fd 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.8.5", + "version": "0.9.0", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -59,9 +59,9 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/plugins": "^0.8.5", - "@jimp/types": "^0.8.5", + "@jimp/custom": "^0.9.0", + "@jimp/plugins": "^0.9.0", + "@jimp/types": "^0.9.0", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, @@ -72,7 +72,7 @@ "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.6.0", "@babel/register": "^7.6.0", - "@jimp/test-utils": "^0.8.5", + "@jimp/test-utils": "^0.9.0", "auto": "^7.6.0", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 6387f57aa..0109ca840 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.8.5", + "version": "0.9.0", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/jpeg": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/jpeg": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 11118dcc6..c4e8dced5 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.8.5", + "version": "0.9.0", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 0c412a9f0..8463bdb0d 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.8.5", + "version": "0.9.0", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index a85c3b9aa..ec6b428a8 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.8.5", + "version": "0.9.0", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5", - "@jimp/types": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0", + "@jimp/types": "^0.9.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index bd2fb6ab0..e1f1ed7bf 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.8.5", + "version": "0.9.0", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/plugin-blit": "^0.8.5", - "@jimp/plugin-resize": "^0.8.5", - "@jimp/plugin-scale": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/plugin-blit": "^0.9.0", + "@jimp/plugin-resize": "^0.9.0", + "@jimp/plugin-scale": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 183790c78..e39a9f851 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.8.5", + "version": "0.9.0", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/plugin-crop": "^0.8.5", - "@jimp/plugin-resize": "^0.8.5", - "@jimp/plugin-scale": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/plugin-crop": "^0.9.0", + "@jimp/plugin-resize": "^0.9.0", + "@jimp/plugin-scale": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index ecfd9d33e..3db84db4d 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.8.5", + "version": "0.9.0", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 7e055c2a9..c475d869d 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.8.5", + "version": "0.9.0", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 4ba6853ce..7aba1dd2d 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.8.5", + "version": "0.9.0", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 198100310..419732343 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.8.5", + "version": "0.9.0", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 880be4951..7771ddc40 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.8.5", + "version": "0.9.0", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 7d458b35c..ff66944de 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.8.5", + "version": "0.9.0", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 6651bd919..2a74dba65 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.8.5", + "version": "0.9.0", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 5bf525064..eba9a423b 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.8.5", + "version": "0.9.0", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index d34e22702..f301414e6 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.8.5", + "version": "0.9.0", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 410a4eae4..2ce8a284f 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.8.5", + "version": "0.9.0", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/plugin-blit": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/plugin-blit": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 615fdb940..64b1b35ab 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.8.5", + "version": "0.9.0", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index abbf6b496..fb7f553b0 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.8.5", + "version": "0.9.0", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/plugin-blit": "^0.8.5", - "@jimp/plugin-crop": "^0.8.5", - "@jimp/plugin-resize": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/plugin-blit": "^0.9.0", + "@jimp/plugin-crop": "^0.9.0", + "@jimp/plugin-resize": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index ac7bf5b5e..93defd4b6 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.8.5", + "version": "0.9.0", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index f7c3dca1e..192d49385 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.8.5", + "version": "0.9.0", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/plugin-blur": "^0.8.5", - "@jimp/plugin-resize": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/plugin-blur": "^0.9.0", + "@jimp/plugin-resize": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 576b38372..424a5d0fd 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.8.5", + "version": "0.9.0", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/jpeg": "^0.8.5", - "@jimp/plugin-color": "^0.8.5", - "@jimp/plugin-resize": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/jpeg": "^0.9.0", + "@jimp/plugin-color": "^0.9.0", + "@jimp/plugin-resize": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 2081b2ae0..151a79b04 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.8.5", - "@jimp/plugin-blur": "^0.8.5", - "@jimp/plugin-color": "^0.8.5", - "@jimp/plugin-contain": "^0.8.5", - "@jimp/plugin-cover": "^0.8.5", - "@jimp/plugin-crop": "^0.8.5", - "@jimp/plugin-displace": "^0.8.5", - "@jimp/plugin-dither": "^0.8.5", - "@jimp/plugin-flip": "^0.8.5", - "@jimp/plugin-gaussian": "^0.8.5", - "@jimp/plugin-invert": "^0.8.5", - "@jimp/plugin-mask": "^0.8.5", - "@jimp/plugin-normalize": "^0.8.5", - "@jimp/plugin-print": "^0.8.5", - "@jimp/plugin-resize": "^0.8.5", - "@jimp/plugin-rotate": "^0.8.5", - "@jimp/plugin-scale": "^0.8.5", + "@jimp/plugin-blit": "^0.9.0", + "@jimp/plugin-blur": "^0.9.0", + "@jimp/plugin-color": "^0.9.0", + "@jimp/plugin-contain": "^0.9.0", + "@jimp/plugin-cover": "^0.9.0", + "@jimp/plugin-crop": "^0.9.0", + "@jimp/plugin-displace": "^0.9.0", + "@jimp/plugin-dither": "^0.9.0", + "@jimp/plugin-flip": "^0.9.0", + "@jimp/plugin-gaussian": "^0.9.0", + "@jimp/plugin-invert": "^0.9.0", + "@jimp/plugin-mask": "^0.9.0", + "@jimp/plugin-normalize": "^0.9.0", + "@jimp/plugin-print": "^0.9.0", + "@jimp/plugin-resize": "^0.9.0", + "@jimp/plugin-rotate": "^0.9.0", + "@jimp/plugin-scale": "^0.9.0", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index ebfe3e4c0..e0b561b47 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.8.5", + "version": "0.9.0", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.8.5", + "@jimp/custom": "^0.9.0", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index c8ea221f8..ffb3bad55 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 6b9aba84d..4bdf7bb58 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index d3fa22f7b..d5ceae372 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index a1e2ccf5b..1137a4346 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.8.5", + "@jimp/utils": "^0.9.0", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 101272e6d..ff79f2042 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.8.5", - "@jimp/test-utils": "^0.8.5" + "@jimp/custom": "^0.9.0", + "@jimp/test-utils": "^0.9.0" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index 71279fc4c..a61fafe79 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.8.5", + "version": "0.9.0", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.8.5", - "@jimp/gif": "^0.8.5", - "@jimp/jpeg": "^0.8.5", - "@jimp/png": "^0.8.5", - "@jimp/tiff": "^0.8.5", + "@jimp/bmp": "^0.9.0", + "@jimp/gif": "^0.9.0", + "@jimp/jpeg": "^0.9.0", + "@jimp/png": "^0.9.0", + "@jimp/tiff": "^0.9.0", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index cd3914722..7a53a92b3 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.8.5", + "version": "0.9.0", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From d406d79a993cd5ac47fada67bfd351fb05de1564 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Tue, 26 Nov 2019 09:33:27 -0800 Subject: [PATCH 027/223] Added callback to jimp constructor typings (#810) --- packages/core/types/jimp.d.ts | 33 ++++++++++++++++++++----------- packages/jimp/types/index.d.ts | 14 ++++++++----- packages/jimp/types/test.ts | 18 +++++++++++++++++ packages/jimp/types/ts3.1/test.ts | 18 +++++++++++++++++ 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts index 36339d14d..b496adce2 100644 --- a/packages/core/types/jimp.d.ts +++ b/packages/core/types/jimp.d.ts @@ -121,8 +121,18 @@ export interface Jimp extends JimpConstructors { y: number, cb?: GenericCallback ): number; - setPixelColor(hex: number, x: number, y: number, cb?: ImageCallback): this; - setPixelColour(hex: number, x: number, y: number, cb?: ImageCallback): this; + setPixelColor( + hex: number, + x: number, + y: number, + cb?: ImageCallback + ): this; + setPixelColour( + hex: number, + x: number, + y: number, + cb?: ImageCallback + ): this; clone(cb?: ImageCallback): this; cloneQuiet(cb?: ImageCallback): this; background(hex: number, cb?: ImageCallback): this; @@ -170,10 +180,15 @@ export interface Jimp extends JimpConstructors { ...args: T[] ) => any ): void; - read(path: string): Promise; - read(image: Jimp): Promise; - read(data: Buffer): Promise; - read(w: number, h: number, background?: number | string): Promise; + read(path: string, cb?: ImageCallback): Promise; + read(image: Jimp, cb?: ImageCallback): Promise; + read(data: Buffer, cb?: ImageCallback): Promise; + read( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ): Promise; create(path: string): Promise; create(image: Jimp): Promise; create(data: Buffer): Promise; @@ -188,11 +203,7 @@ export interface Jimp extends JimpConstructors { intToRGBA(i: number, cb?: GenericCallback): RGBA; cssColorToHex(cssColor: string): number; limit255(n: number): number; - diff( - img1: Jimp, - img2: Jimp, - threshold?: number - ): DiffReturn; + diff(img1: Jimp, img2: Jimp, threshold?: number): DiffReturn; distance(img1: Jimp, img2: Jimp): number; compareHashes(hash1: string, hash2: string): number; colorDiff(rgba1: RGB, rgba2: RGB): number; diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts index 32d0e4224..d8881787f 100644 --- a/packages/jimp/types/index.d.ts +++ b/packages/jimp/types/index.d.ts @@ -351,11 +351,15 @@ interface DepreciatedJimp { ...args: T[] ) => any ): void; - read(path: string): Promise; - read(image: this): Promise; - read(data: Buffer): Promise; - read(w: number, h: number, background?: number | string): Promise; - create(path: string): Promise; + read(path: string, cb?: ImageCallback): Promise; + read(image: this, cb?: ImageCallback): Promise; + read(data: Buffer, cb?: ImageCallback): Promise; + read( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ): Promise; create(path: string): Promise; create(image: this): Promise; create(data: Buffer): Promise; create(w: number, h: number, background?: number | string): Promise; diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts index 54d5a3dc7..13a257150 100644 --- a/packages/jimp/types/test.ts +++ b/packages/jimp/types/test.ts @@ -68,3 +68,21 @@ test('can clone properly', async () => { }) }) }); + +test('Can handle callback with constructor', () => { + const myBmpBuffer: Buffer = {} as any; + + Jimp.read(myBmpBuffer, (err, cbJimpInst) => { + cbJimpInst.read('Test'); + cbJimpInst.displace(jimpInst, 2); + cbJimpInst.resize(40, 40); + // $ExpectType 0 + cbJimpInst.PNG_FILTER_NONE; + + // $ExpectError + cbJimpInst.test; + + // $ExpectError + cbJimpInst.func(); + }); +}) diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts index dbec3103f..d0be22d22 100644 --- a/packages/jimp/types/ts3.1/test.ts +++ b/packages/jimp/types/ts3.1/test.ts @@ -68,3 +68,21 @@ test('can clone properly', async () => { }) }) }); + +test('Can handle callback with constructor', () => { + const myBmpBuffer: Buffer = {} as any; + + Jimp.read(myBmpBuffer, (err, cbJimpInst) => { + cbJimpInst.read('Test'); + cbJimpInst.displace(jimpInst, 2); + cbJimpInst.resize(40, 40); + // $ExpectType 0 + cbJimpInst.PNG_FILTER_NONE; + + // $ExpectError + cbJimpInst.test; + + // $ExpectError + cbJimpInst.func(); + }); +}); From 3ad3c3b4c5a8b9169f4a560ef339bf8695d62d0f Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 17:39:55 +0000 Subject: [PATCH 028/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fe456376..b5535fe17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.9.1 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/core`, `jimp` + - Added callback to jimp constructor typings [#810](https://github.com/oliver-moran/jimp/pull/810) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.0 (Tue Nov 26 2019) #### 🚀 Enhancement From c6f11425c0e8585a73109d61d3372612bfa3799f Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 17:39:56 +0000 Subject: [PATCH 029/223] Bump version to: 0.9.1 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 6 ++--- packages/core/package.json | 4 +-- packages/custom/package.json | 4 +-- packages/jimp/package.json | 10 +++---- packages/plugin-blit/package.json | 10 +++---- packages/plugin-blur/package.json | 4 +-- packages/plugin-circle/package.json | 8 +++--- packages/plugin-color/package.json | 10 +++---- packages/plugin-contain/package.json | 14 +++++----- packages/plugin-cover/package.json | 14 +++++----- packages/plugin-crop/package.json | 8 +++--- packages/plugin-displace/package.json | 4 +-- packages/plugin-dither/package.json | 4 +-- packages/plugin-fisheye/package.json | 8 +++--- packages/plugin-flip/package.json | 4 +-- packages/plugin-gaussian/package.json | 4 +-- packages/plugin-invert/package.json | 4 +-- packages/plugin-mask/package.json | 8 +++--- packages/plugin-normalize/package.json | 8 +++--- packages/plugin-print/package.json | 10 +++---- packages/plugin-resize/package.json | 8 +++--- packages/plugin-rotate/package.json | 14 +++++----- packages/plugin-scale/package.json | 4 +-- packages/plugin-shadow/package.json | 12 ++++----- packages/plugin-threshold/package.json | 14 +++++----- packages/plugins/package.json | 36 +++++++++++++------------- packages/test-utils/package.json | 4 +-- packages/type-bmp/package.json | 8 +++--- packages/type-gif/package.json | 4 +-- packages/type-jpeg/package.json | 8 +++--- packages/type-png/package.json | 8 +++--- packages/type-tiff/package.json | 6 ++--- packages/types/package.json | 12 ++++----- packages/utils/package.json | 2 +- 35 files changed, 144 insertions(+), 144 deletions(-) diff --git a/lerna.json b/lerna.json index e82f2edf1..d8a450d0f 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.0" + "version": "0.9.1" } diff --git a/packages/cli/package.json b/packages/cli/package.json index f50052fb7..f6c076c24 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.0", + "version": "0.9.1", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.9.0", + "@jimp/custom": "^0.9.1", "chalk": "^2.4.1", - "jimp": "^0.9.0", + "jimp": "^0.9.1", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index e087e9574..486eb31dd 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.0", + "version": "0.9.1", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -34,7 +34,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^2.5.7", diff --git a/packages/custom/package.json b/packages/custom/package.json index 357d1a285..dd38297b8 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.0", + "version": "0.9.1", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.9.0", + "@jimp/core": "^0.9.1", "core-js": "^2.5.7" }, "publishConfig": { diff --git a/packages/jimp/package.json b/packages/jimp/package.json index ed03d33fd..a7d221a08 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.0", + "version": "0.9.1", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -59,9 +59,9 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/plugins": "^0.9.0", - "@jimp/types": "^0.9.0", + "@jimp/custom": "^0.9.1", + "@jimp/plugins": "^0.9.1", + "@jimp/types": "^0.9.1", "core-js": "^2.5.7", "regenerator-runtime": "^0.13.3" }, @@ -72,7 +72,7 @@ "@babel/plugin-syntax-object-rest-spread": "^7.2.0", "@babel/preset-env": "^7.6.0", "@babel/register": "^7.6.0", - "@jimp/test-utils": "^0.9.0", + "@jimp/test-utils": "^0.9.1", "auto": "^7.6.0", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 0109ca840..1a90e469d 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.0", + "version": "0.9.1", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,13 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/jpeg": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/jpeg": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index c4e8dced5..0f8122502 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.0", + "version": "0.9.1", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 8463bdb0d..b3172b981 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.0", + "version": "0.9.1", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index ec6b428a8..8917053e4 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.0", + "version": "0.9.1", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,14 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0", - "@jimp/types": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1", + "@jimp/types": "^0.9.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index e1f1ed7bf..779d15679 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.0", + "version": "0.9.1", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/plugin-blit": "^0.9.0", - "@jimp/plugin-resize": "^0.9.0", - "@jimp/plugin-scale": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/plugin-blit": "^0.9.1", + "@jimp/plugin-resize": "^0.9.1", + "@jimp/plugin-scale": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index e39a9f851..6ee74b5f2 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.0", + "version": "0.9.1", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/plugin-crop": "^0.9.0", - "@jimp/plugin-resize": "^0.9.0", - "@jimp/plugin-scale": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/plugin-crop": "^0.9.1", + "@jimp/plugin-resize": "^0.9.1", + "@jimp/plugin-scale": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 3db84db4d..4f4b039e0 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.0", + "version": "0.9.1", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,12 +20,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index c475d869d..c7adfb082 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.0", + "version": "0.9.1", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 7aba1dd2d..ab43c9d80 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.0", + "version": "0.9.1", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 419732343..63c096efa 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.0", + "version": "0.9.1", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 7771ddc40..00318bc09 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.0", + "version": "0.9.1", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index ff66944de..8fd3be408 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.0", + "version": "0.9.1", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 2a74dba65..1131f4959 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.0", + "version": "0.9.1", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index eba9a423b..f55c82b40 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.0", + "version": "0.9.1", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index f301414e6..29c23a738 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.0", + "version": "0.9.1", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 2ce8a284f..ebba66ab8 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.0", + "version": "0.9.1", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7", "load-bmfont": "^1.4.0" }, @@ -29,9 +29,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/plugin-blit": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/plugin-blit": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 64b1b35ab..446f74a41 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.0", + "version": "0.9.1", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,15 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index fb7f553b0..af72dc3e8 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.0", + "version": "0.9.1", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -30,11 +30,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/plugin-blit": "^0.9.0", - "@jimp/plugin-crop": "^0.9.0", - "@jimp/plugin-resize": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/plugin-blit": "^0.9.1", + "@jimp/plugin-crop": "^0.9.1", + "@jimp/plugin-resize": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 93defd4b6..3f340ce47 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.0", + "version": "0.9.1", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 192d49385..499af59c6 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.0", + "version": "0.9.1", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,10 +29,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/plugin-blur": "^0.9.0", - "@jimp/plugin-resize": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/plugin-blur": "^0.9.1", + "@jimp/plugin-resize": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 424a5d0fd..c5a81ea43 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.0", + "version": "0.9.1", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7" }, "peerDependencies": { @@ -29,11 +29,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/jpeg": "^0.9.0", - "@jimp/plugin-color": "^0.9.0", - "@jimp/plugin-resize": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/jpeg": "^0.9.1", + "@jimp/plugin-color": "^0.9.1", + "@jimp/plugin-resize": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 151a79b04..b0380210f 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,23 +17,23 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.9.0", - "@jimp/plugin-blur": "^0.9.0", - "@jimp/plugin-color": "^0.9.0", - "@jimp/plugin-contain": "^0.9.0", - "@jimp/plugin-cover": "^0.9.0", - "@jimp/plugin-crop": "^0.9.0", - "@jimp/plugin-displace": "^0.9.0", - "@jimp/plugin-dither": "^0.9.0", - "@jimp/plugin-flip": "^0.9.0", - "@jimp/plugin-gaussian": "^0.9.0", - "@jimp/plugin-invert": "^0.9.0", - "@jimp/plugin-mask": "^0.9.0", - "@jimp/plugin-normalize": "^0.9.0", - "@jimp/plugin-print": "^0.9.0", - "@jimp/plugin-resize": "^0.9.0", - "@jimp/plugin-rotate": "^0.9.0", - "@jimp/plugin-scale": "^0.9.0", + "@jimp/plugin-blit": "^0.9.1", + "@jimp/plugin-blur": "^0.9.1", + "@jimp/plugin-color": "^0.9.1", + "@jimp/plugin-contain": "^0.9.1", + "@jimp/plugin-cover": "^0.9.1", + "@jimp/plugin-crop": "^0.9.1", + "@jimp/plugin-displace": "^0.9.1", + "@jimp/plugin-dither": "^0.9.1", + "@jimp/plugin-flip": "^0.9.1", + "@jimp/plugin-gaussian": "^0.9.1", + "@jimp/plugin-invert": "^0.9.1", + "@jimp/plugin-mask": "^0.9.1", + "@jimp/plugin-normalize": "^0.9.1", + "@jimp/plugin-print": "^0.9.1", + "@jimp/plugin-resize": "^0.9.1", + "@jimp/plugin-rotate": "^0.9.1", + "@jimp/plugin-scale": "^0.9.1", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index e0b561b47..b20176574 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.0", + "version": "0.9.1", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.9.0", + "@jimp/custom": "^0.9.1", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index ffb3bad55..a07732532 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "bmp-js": "^0.1.0", "core-js": "^2.5.7" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 4bdf7bb58..e7a47936e 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7", "omggif": "^1.0.9" }, diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index d5ceae372..4367948df 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7", "jpeg-js": "^0.3.4" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 1137a4346..2c73d7a2b 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.0", + "@jimp/utils": "^0.9.1", "core-js": "^2.5.7", "pngjs": "^3.3.3" }, @@ -28,8 +28,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index ff79f2042..63425ec75 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -27,8 +27,8 @@ "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.0", - "@jimp/test-utils": "^0.9.0" + "@jimp/custom": "^0.9.1", + "@jimp/test-utils": "^0.9.1" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index a61fafe79..654fda718 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.0", + "version": "0.9.1", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,11 +17,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.9.0", - "@jimp/gif": "^0.9.0", - "@jimp/jpeg": "^0.9.0", - "@jimp/png": "^0.9.0", - "@jimp/tiff": "^0.9.0", + "@jimp/bmp": "^0.9.1", + "@jimp/gif": "^0.9.1", + "@jimp/jpeg": "^0.9.1", + "@jimp/png": "^0.9.1", + "@jimp/tiff": "^0.9.1", "core-js": "^2.5.7", "timm": "^1.6.1" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 7a53a92b3..cbfe6b1bc 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.0", + "version": "0.9.1", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From c3835b2b658ad634151771ea29a7296d7deb7a44 Mon Sep 17 00:00:00 2001 From: Sander Weyens <1469848+SaWey@users.noreply.github.com> Date: Tue, 26 Nov 2019 18:46:17 +0100 Subject: [PATCH 030/223] Follow redirects (#789) * Follow redirects Fixes #775 * Follow redirects Fixing lint error * Follow redirects Fix tests * Added redirect test * Fixed lint errors * Skip redirect test in browser as we cannot mock a server * Different test for browser * Fixed browser detection --- packages/core/src/index.js | 5 +++ packages/core/test/images/pixel.png | Bin 0 -> 68 bytes packages/core/test/redirect.test.js | 57 ++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 packages/core/test/images/pixel.png create mode 100644 packages/core/test/redirect.test.js diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 58a984478..d048e8389 100755 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -63,6 +63,11 @@ function loadFromURL(options, cb) { if (err) { return cb(err); } + + if('headers' in response && 'location' in response.headers){ + options.url = response.headers.location; + return loadFromURL(options, cb); + } if (typeof data === 'object' && Buffer.isBuffer(data)) { return cb(null, data); diff --git a/packages/core/test/images/pixel.png b/packages/core/test/images/pixel.png new file mode 100644 index 0000000000000000000000000000000000000000..26a8c68efad2a094e8fe6d850426b651d353c568 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcwN$DL?ob7+Dz^)g>OM Q0fiYnUHx3vIVCg!0A@T4ng9R* literal 0 HcmV?d00001 diff --git a/packages/core/test/redirect.test.js b/packages/core/test/redirect.test.js new file mode 100644 index 000000000..958d71f6e --- /dev/null +++ b/packages/core/test/redirect.test.js @@ -0,0 +1,57 @@ +import { Jimp as jimp, getTestDir } from '@jimp/test-utils'; + +const fs = require('fs'); +const http = require('http'); + +const imagesDir = getTestDir(__dirname) + '/images'; + +const httpHandler = (req, res) => { + switch (req.method) { + case 'GET': + switch (req.url) { + case '/redirect.png': + res.writeHead(301, { + Location: 'http://localhost:5136/corrected.png' + }); + res.end(); + break; + case '/corrected.png': + res.writeHead(200, { 'Content-Type': 'image/png' }); + res.end(fs.readFileSync(imagesDir + '/pixel.png'), 'binary'); + break; + default: + res.writeHead(404); + res.end('Not a valid test endpoint'); + break; + } + break; + default: + res.writeHead(404); + res.end('Invalid request method'); + break; + } +}; + +describe('redirect', function() { + if (typeof window !== 'undefined' && typeof window.document !== 'undefined') { + xit('Not testing redirects in browser'); + } else { + const httpServer = http.createServer(httpHandler); + before(function() { + httpServer.listen(5136); + }); + + it('follows 301 redirect', function(done) { + jimp + .read('http://localhost:5136/redirect.png') + .then(() => { + httpServer.close(); + done(); + }) + .catch(error => { + httpServer.close(); + done(error); + }); + }); + } +}); From 7c4c8095df0eba2de03d33908b0fc4adb5670492 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Tue, 26 Nov 2019 12:15:02 -0800 Subject: [PATCH 031/223] Fix regeneratorRuntime errors (#815) * Fix regeneratorRuntime errors This closes #797 * Fix issues modules false values * fix lint * use links --- CHANGELOG.md | 20 +- babel.config.js | 13 +- package.json | 12 +- packages/cli/package.json | 2 +- packages/core/package.json | 5 +- packages/core/src/index.js | 4 +- packages/core/test/redirect.test.js | 1 + packages/custom/package.json | 5 +- packages/jimp/package.json | 21 +- packages/plugin-blit/package.json | 11 +- packages/plugin-blur/package.json | 5 +- packages/plugin-circle/package.json | 9 +- packages/plugin-color/package.json | 11 +- packages/plugin-contain/package.json | 15 +- packages/plugin-cover/package.json | 15 +- packages/plugin-crop/package.json | 9 +- packages/plugin-displace/package.json | 5 +- packages/plugin-dither/package.json | 5 +- packages/plugin-fisheye/package.json | 9 +- packages/plugin-flip/package.json | 5 +- packages/plugin-gaussian/package.json | 5 +- packages/plugin-invert/package.json | 5 +- packages/plugin-mask/package.json | 9 +- packages/plugin-normalize/package.json | 9 +- packages/plugin-print/package.json | 11 +- packages/plugin-resize/package.json | 9 +- packages/plugin-rotate/package.json | 15 +- packages/plugin-scale/package.json | 5 +- packages/plugin-shadow/package.json | 13 +- packages/plugin-threshold/package.json | 15 +- packages/plugins/package.json | 37 +- packages/test-utils/package.json | 5 +- packages/type-bmp/package.json | 9 +- packages/type-gif/package.json | 5 +- packages/type-jpeg/package.json | 9 +- packages/type-png/package.json | 9 +- packages/type-tiff/package.json | 7 +- packages/types/package.json | 13 +- packages/utils/package.json | 3 +- yarn.lock | 794 +++++++++++++++++++------ 40 files changed, 808 insertions(+), 361 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5535fe17..505602232 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # v0.9.1 (Tue Nov 26 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/core`, `jimp` - Added callback to jimp constructor typings [#810](https://github.com/oliver-moran/jimp/pull/810) ([@crutchcorn](https://github.com/crutchcorn)) @@ -13,7 +13,7 @@ # v0.9.0 (Tue Nov 26 2019) -#### 🚀 Enhancement +#### 🚀 Enhancement - `jimp` - Revert exports to match 0.6.4 TS definitions [#820](https://github.com/oliver-moran/jimp/pull/820) ([@crutchcorn](https://github.com/crutchcorn)) @@ -26,17 +26,17 @@ # v0.8.5 (Fri Oct 18 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/core` - Image dimensions during exif rotation have been corrected [#791](https://github.com/oliver-moran/jimp/pull/791) (alexander.shcherbakov@btsdigital.kz [@popinguy](https://github.com/popinguy)) -#### 🏠 Internal +#### 🏠 Internal - `@jimp/cli`, `@jimp/core`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-color`, `@jimp/plugin-crop`, `@jimp/plugin-normalize`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/test-utils`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types` - Upgrade nearly-all dev deps [#799](https://github.com/oliver-moran/jimp/pull/799) ([@popinguy](https://github.com/popinguy) [@hipstersmoothie](https://github.com/hipstersmoothie)) -#### 📝 Documentation +#### 📝 Documentation - Added back mention of required tsconfig options [#800](https://github.com/oliver-moran/jimp/pull/800) ([@popinguy](https://github.com/popinguy)) @@ -50,7 +50,7 @@ # v0.8.4 (Fri Sep 20 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/jpeg`, `@jimp/png` - TS 3.1 fixed [#798](https://github.com/oliver-moran/jimp/pull/798) ([@crutchcorn](https://github.com/crutchcorn)) @@ -63,7 +63,7 @@ # v0.8.3 (Wed Sep 18 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/core`, `@jimp/custom`, `jimp` - Fix issues with typings using classes, publish @core typings, and fix 3.1 typings [#792](https://github.com/oliver-moran/jimp/pull/792) ([@crutchcorn](https://github.com/crutchcorn)) @@ -76,7 +76,7 @@ # v0.8.2 (Fri Sep 13 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `jimp` - must ship types [#794](https://github.com/oliver-moran/jimp/pull/794) ([@hipstersmoothie](https://github.com/hipstersmoothie)) @@ -89,7 +89,7 @@ # v0.8.1 (Thu Sep 12 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/utils` - Fix 0.8 typings, add type tests [#786](https://github.com/oliver-moran/jimp/pull/786) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) @@ -103,7 +103,7 @@ # v0.8.0 (Sat Sep 07 2019) -#### 🚀 Enhancement +#### 🚀 Enhancement - `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` - Made typings plugin friendly & add typings for every package [#770](https://github.com/oliver-moran/jimp/pull/770) ([@crutchcorn](https://github.com/crutchcorn)) diff --git a/babel.config.js b/babel.config.js index 60a6d805d..21e8be725 100644 --- a/babel.config.js +++ b/babel.config.js @@ -4,9 +4,10 @@ module.exports = api => { return { presets: [ [ - '@babel/env', + '@babel/preset-env', { - useBuiltIns: 'usage' + useBuiltIns: 'usage', + corejs: 3 } ] ], @@ -18,6 +19,12 @@ module.exports = api => { [ 'transform-inline-environment-variables', { include: ['BABEL_ENV', 'ENV'] } + ], + [ + '@babel/plugin-transform-runtime', + { + regenerator: true + } ] ].filter(Boolean), @@ -31,7 +38,7 @@ module.exports = api => { ) }, module: { - presets: [['@babel/env', { modules: false }]] + presets: [['@babel/preset-env']] } } }; diff --git a/package.json b/package.json index 642b1d2ab..76a43de47 100644 --- a/package.json +++ b/package.json @@ -25,12 +25,14 @@ "tsTest:main": "dtslint packages/jimp/types --expectOnly" }, "devDependencies": { - "@babel/cli": "^7.6.0", - "@babel/core": "^7.6.0", - "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/cli": "^7.7.0", + "@babel/core": "^7.7.2", + "@babel/plugin-proposal-class-properties": "^7.7.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/preset-env": "^7.6.0", - "@babel/register": "^7.6.0", + "@babel/plugin-transform-runtime": "^7.6.2", + "@babel/preset-env": "^7.7.1", + "@babel/register": "^7.7.0", + "@babel/runtime": "^7.7.2", "auto": "^7.6.0", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index f6c076c24..c269e7403 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -17,7 +17,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.9.1", + "@jimp/custom": "link:../custom", "chalk": "^2.4.1", "jimp": "^0.9.1", "log-symbols": "^2.2.0", diff --git a/packages/core/package.json b/packages/core/package.json index 486eb31dd..118224b0b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,10 +34,11 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", + "@jimp/utils": "link:../utils", "any-base": "^1.1.0", "buffer": "^5.2.0", - "core-js": "^2.5.7", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "exif-parser": "^0.1.12", "file-type": "^9.0.0", "load-bmfont": "^1.3.1", diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d048e8389..e7edc26c9 100755 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -63,8 +63,8 @@ function loadFromURL(options, cb) { if (err) { return cb(err); } - - if('headers' in response && 'location' in response.headers){ + + if ('headers' in response && 'location' in response.headers) { options.url = response.headers.location; return loadFromURL(options, cb); } diff --git a/packages/core/test/redirect.test.js b/packages/core/test/redirect.test.js index 958d71f6e..69b2cbff0 100644 --- a/packages/core/test/redirect.test.js +++ b/packages/core/test/redirect.test.js @@ -24,6 +24,7 @@ const httpHandler = (req, res) => { res.end('Not a valid test endpoint'); break; } + break; default: res.writeHead(404); diff --git a/packages/custom/package.json b/packages/custom/package.json index dd38297b8..a41aaca6d 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/core": "link:../core", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "publishConfig": { "access": "public" diff --git a/packages/jimp/package.json b/packages/jimp/package.json index a7d221a08..307348fe1 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -59,20 +59,21 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/plugins": "^0.9.1", - "@jimp/types": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/custom": "link:../custom", + "@jimp/plugins": "link:../plugins", + "@jimp/types": "link:../types", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "regenerator-runtime": "^0.13.3" }, "devDependencies": { - "@babel/cli": "^7.6.0", - "@babel/core": "^7.6.0", - "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/cli": "^7.7.0", + "@babel/core": "^7.7.2", + "@babel/plugin-proposal-class-properties": "^7.7.0", "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/preset-env": "^7.6.0", - "@babel/register": "^7.6.0", - "@jimp/test-utils": "^0.9.1", + "@babel/preset-env": "^7.7.1", + "@babel/register": "^7.7.0", + "@jimp/test-utils": "link:../test-utils", "auto": "^7.6.0", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 1a90e469d..342522dd4 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -20,13 +20,14 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/jpeg": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/jpeg": "link:../type-jpeg", + "@jimp/test-utils": "link:../test-utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 0f8122502..755e7bc7a 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index b3172b981..9d05f135a 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -20,15 +20,16 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 8917053e4..53d515e07 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -20,14 +20,15 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "tinycolor2": "^1.4.1" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1", - "@jimp/types": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils", + "@jimp/types": "link:../types" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 779d15679..c44d5e836 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -20,8 +20,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -30,11 +31,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/plugin-blit": "^0.9.1", - "@jimp/plugin-resize": "^0.9.1", - "@jimp/plugin-scale": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/plugin-blit": "link:../plugin-blit", + "@jimp/plugin-resize": "link:../plugin-resize", + "@jimp/plugin-scale": "link:../plugin-scale", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 6ee74b5f2..3d9ba4558 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -20,8 +20,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -30,11 +31,11 @@ "@jimp/plugin-scale": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/plugin-crop": "^0.9.1", - "@jimp/plugin-resize": "^0.9.1", - "@jimp/plugin-scale": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/plugin-crop": "link:../plugin-crop", + "@jimp/plugin-resize": "link:../plugin-resize", + "@jimp/plugin-scale": "link:../plugin-scale", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 4f4b039e0..1bd31a15d 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -20,12 +20,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index c7adfb082..bbeb057dd 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index ab43c9d80..92af6cfaf 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 63c096efa..77eee5a23 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -20,15 +20,16 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 00318bc09..7e4ccc514 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 8fd3be408..4aa00f3bc 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 1131f4959..78bb6f9b4 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index f55c82b40..79b2ad262 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -20,15 +20,16 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 29c23a738..cf8f78cab 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -20,15 +20,16 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index ebba66ab8..a8c03be50 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -20,8 +20,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "load-bmfont": "^1.4.0" }, "peerDependencies": { @@ -29,9 +30,9 @@ "@jimp/plugin-blit": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/plugin-blit": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/plugin-blit": "link:../plugin-blit", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 446f74a41..5a1d5fd2b 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -20,15 +20,16 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index af72dc3e8..5a93a3935 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -20,8 +20,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -30,11 +31,11 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/plugin-blit": "^0.9.1", - "@jimp/plugin-crop": "^0.9.1", - "@jimp/plugin-resize": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/plugin-blit": "link:../plugin-blit", + "@jimp/plugin-crop": "link:../plugin-crop", + "@jimp/plugin-resize": "link:../plugin-resize", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 3f340ce47..7e0a2580f 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 499af59c6..51683f479 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -20,8 +20,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -29,10 +30,10 @@ "@jimp/plugin-resize": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/plugin-blur": "^0.9.1", - "@jimp/plugin-resize": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/plugin-blur": "link:../plugin-blur", + "@jimp/plugin-resize": "link:../plugin-resize", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index c5a81ea43..203f9108e 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -20,8 +20,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7" + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", @@ -29,11 +30,11 @@ "@jimp/plugin-resize": "^0.8.0" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/jpeg": "^0.9.1", - "@jimp/plugin-color": "^0.9.1", - "@jimp/plugin-resize": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/jpeg": "link:../type-jpeg", + "@jimp/plugin-color": "link:../plugin-color", + "@jimp/plugin-resize": "link:../plugin-resize", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/plugins/package.json b/packages/plugins/package.json index b0380210f..2eb98ea04 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -17,24 +17,25 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/plugin-blit": "^0.9.1", - "@jimp/plugin-blur": "^0.9.1", - "@jimp/plugin-color": "^0.9.1", - "@jimp/plugin-contain": "^0.9.1", - "@jimp/plugin-cover": "^0.9.1", - "@jimp/plugin-crop": "^0.9.1", - "@jimp/plugin-displace": "^0.9.1", - "@jimp/plugin-dither": "^0.9.1", - "@jimp/plugin-flip": "^0.9.1", - "@jimp/plugin-gaussian": "^0.9.1", - "@jimp/plugin-invert": "^0.9.1", - "@jimp/plugin-mask": "^0.9.1", - "@jimp/plugin-normalize": "^0.9.1", - "@jimp/plugin-print": "^0.9.1", - "@jimp/plugin-resize": "^0.9.1", - "@jimp/plugin-rotate": "^0.9.1", - "@jimp/plugin-scale": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/plugin-blit": "link:../plugin-blit", + "@jimp/plugin-blur": "link:../plugin-blur", + "@jimp/plugin-color": "link:../plugin-color", + "@jimp/plugin-contain": "link:../plugin-contain", + "@jimp/plugin-cover": "link:../plugin-cover", + "@jimp/plugin-crop": "link:../plugin-crop", + "@jimp/plugin-displace": "link:../plugin-displace", + "@jimp/plugin-dither": "link:../plugin-dither", + "@jimp/plugin-flip": "link:../plugin-flip", + "@jimp/plugin-gaussian": "link:../plugin-gaussian", + "@jimp/plugin-invert": "link:../plugin-invert", + "@jimp/plugin-mask": "link:../plugin-mask", + "@jimp/plugin-normalize": "link:../plugin-normalize", + "@jimp/plugin-print": "link:../plugin-print", + "@jimp/plugin-resize": "link:../plugin-resize", + "@jimp/plugin-rotate": "link:../plugin-rotate", + "@jimp/plugin-scale": "link:../plugin-scale", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "timm": "^1.6.1" }, "peerDependencies": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index b20176574..1bc7c5b13 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -22,11 +22,12 @@ "access": "public" }, "dependencies": { - "core-js": "^2.5.7", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "pngjs": "^3.3.3" }, "devDependencies": { - "@jimp/custom": "^0.9.1", + "@jimp/custom": "link:../custom", "should": "^13.2.3" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index a07732532..f869ac5fb 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -20,16 +20,17 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", + "@jimp/utils": "link:../utils", "bmp-js": "^0.1.0", - "core-js": "^2.5.7" + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index e7a47936e..36b053997 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -17,8 +17,9 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "omggif": "^1.0.9" }, "peerDependencies": { diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 4367948df..3cffe7341 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -20,16 +20,17 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "jpeg-js": "^0.3.4" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 2c73d7a2b..8cc794fc0 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -20,16 +20,17 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/utils": "link:../utils", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "pngjs": "^3.3.3" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 63425ec75..540818834 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -20,15 +20,16 @@ "author": "", "license": "MIT", "dependencies": { - "core-js": "^2.5.7", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "utif": "^2.0.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" }, "devDependencies": { - "@jimp/custom": "^0.9.1", - "@jimp/test-utils": "^0.9.1" + "@jimp/custom": "link:../custom", + "@jimp/test-utils": "link:../test-utils" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index 654fda718..c12219774 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -17,12 +17,13 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/bmp": "^0.9.1", - "@jimp/gif": "^0.9.1", - "@jimp/jpeg": "^0.9.1", - "@jimp/png": "^0.9.1", - "@jimp/tiff": "^0.9.1", - "core-js": "^2.5.7", + "@jimp/bmp": "link:../type-bmp", + "@jimp/gif": "link:../type-gif", + "@jimp/jpeg": "link:../type-jpeg", + "@jimp/png": "link:../type-png", + "@jimp/tiff": "link:../type-tiff", + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2", "timm": "^1.6.1" }, "peerDependencies": { diff --git a/packages/utils/package.json b/packages/utils/package.json index cbfe6b1bc..64435001d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -20,6 +20,7 @@ "access": "public" }, "dependencies": { - "core-js": "^2.5.7" + "core-js": "^3.4.1", + "@babel/runtime": "^7.7.2" } } diff --git a/yarn.lock b/yarn.lock index b20cc51a9..7367df8a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -60,18 +60,17 @@ "@auto-it/core" "^7.6.0" deepmerge "^4.0.0" -"@babel/cli@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.6.0.tgz#1470a04394eaf37862989ea4912adf440fa6ff8d" - integrity sha512-1CTDyGUjQqW3Mz4gfKZ04KGOckyyaNmKneAMlABPS+ZyuxWv3FrVEVz7Ag08kNIztVx8VaJ8YgvYLSNlMKAT5Q== +"@babel/cli@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.0.tgz#8d10c9acb2acb362d7614a9493e1791c69100d89" + integrity sha512-jECEqAq6Ngf3pOhLSg7od9WKyrIacyh1oNNYtRXNn+ummSHCTXBamGywOAtiae34Vk7zKuQNnLvo2BKTMCoV4A== dependencies: commander "^2.8.1" convert-source-map "^1.1.0" fs-readdir-recursive "^1.1.0" glob "^7.0.0" lodash "^4.17.13" - mkdirp "^0.5.1" - output-file-sync "^2.0.0" + make-dir "^2.1.0" slash "^2.0.0" source-map "^0.5.0" optionalDependencies: @@ -84,19 +83,19 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz#9b00f73554edd67bebc86df8303ef678be3d7b48" - integrity sha512-FuRhDRtsd6IptKpHXAa+4WPZYY2ZzgowkbLBecEDDSje1X/apG7jQM33or3NdOmjXBKWGOg4JmSiRfUfuTtHXw== +"@babel/core@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91" + integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ== dependencies: "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.6.0" - "@babel/helpers" "^7.6.0" - "@babel/parser" "^7.6.0" - "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.0" - "@babel/types" "^7.6.0" - convert-source-map "^1.1.0" + "@babel/generator" "^7.7.2" + "@babel/helpers" "^7.7.0" + "@babel/parser" "^7.7.2" + "@babel/template" "^7.7.0" + "@babel/traverse" "^7.7.2" + "@babel/types" "^7.7.2" + convert-source-map "^1.7.0" debug "^4.1.0" json5 "^2.1.0" lodash "^4.17.13" @@ -115,6 +114,16 @@ source-map "^0.5.0" trim-right "^1.0.1" +"@babel/generator@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af" + integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ== + dependencies: + "@babel/types" "^7.7.2" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" @@ -122,6 +131,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-annotate-as-pure@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz#efc54032d43891fe267679e63f6860aa7dbf4a5e" + integrity sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" @@ -139,25 +155,33 @@ "@babel/traverse" "^7.4.4" "@babel/types" "^7.4.4" -"@babel/helper-create-class-features-plugin@^7.5.5": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f" - integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng== +"@babel/helper-create-class-features-plugin@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz#bcdc223abbfdd386f94196ae2544987f8df775e8" + integrity sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-function-name" "^7.7.0" + "@babel/helper-member-expression-to-functions" "^7.7.0" + "@babel/helper-optimise-call-expression" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" -"@babel/helper-define-map@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" - integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== +"@babel/helper-create-regexp-features-plugin@^7.7.0": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz#6f20443778c8fce2af2ff4206284afc0ced65db6" + integrity sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/types" "^7.5.5" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + +"@babel/helper-define-map@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529" + integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA== + dependencies: + "@babel/helper-function-name" "^7.7.0" + "@babel/types" "^7.7.0" lodash "^4.17.13" "@babel/helper-explode-assignable-expression@^7.1.0": @@ -177,6 +201,15 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-function-name@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3" + integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q== + dependencies: + "@babel/helper-get-function-arity" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-get-function-arity@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" @@ -184,6 +217,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-get-function-arity@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d" + integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-hoist-variables@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" @@ -191,6 +231,13 @@ dependencies: "@babel/types" "^7.4.4" +"@babel/helper-hoist-variables@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz#b4552e4cfe5577d7de7b183e193e84e4ec538c81" + integrity sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-member-expression-to-functions@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" @@ -198,6 +245,13 @@ dependencies: "@babel/types" "^7.5.5" +"@babel/helper-member-expression-to-functions@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a" + integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-module-imports@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" @@ -205,7 +259,14 @@ dependencies: "@babel/types" "^7.0.0" -"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": +"@babel/helper-module-imports@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d" + integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw== + dependencies: + "@babel/types" "^7.7.0" + +"@babel/helper-module-transforms@^7.1.0": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a" integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw== @@ -217,6 +278,18 @@ "@babel/types" "^7.5.5" lodash "^4.17.13" +"@babel/helper-module-transforms@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz#154a69f0c5b8fd4d39e49750ff7ac4faa3f36786" + integrity sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ== + dependencies: + "@babel/helper-module-imports" "^7.7.0" + "@babel/helper-simple-access" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/types" "^7.7.0" + lodash "^4.17.13" + "@babel/helper-optimise-call-expression@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" @@ -224,6 +297,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-optimise-call-expression@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365" + integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" @@ -236,16 +316,16 @@ dependencies: lodash "^4.17.13" -"@babel/helper-remap-async-to-generator@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f" - integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== +"@babel/helper-remap-async-to-generator@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7" + integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-wrap-function" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.0" + "@babel/helper-wrap-function" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" "@babel/helper-replace-supers@^7.5.5": version "7.5.5" @@ -257,6 +337,16 @@ "@babel/traverse" "^7.5.5" "@babel/types" "^7.5.5" +"@babel/helper-replace-supers@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512" + integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.7.0" + "@babel/helper-optimise-call-expression" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-simple-access@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" @@ -265,6 +355,14 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-simple-access@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d" + integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g== + dependencies: + "@babel/template" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-split-export-declaration@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" @@ -272,24 +370,31 @@ dependencies: "@babel/types" "^7.4.4" -"@babel/helper-wrap-function@^7.1.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" - integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== +"@babel/helper-split-export-declaration@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300" + integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.2.0" + "@babel/types" "^7.7.0" -"@babel/helpers@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.0.tgz#21961d16c6a3c3ab597325c34c465c0887d31c6e" - integrity sha512-W9kao7OBleOjfXtFGgArGRX6eCP0UEcA2ZWEWNkJdRZnHhW4eEbeswbG3EwaRsnQUAEGWYgMq1HsIXuNNNy2eQ== +"@babel/helper-wrap-function@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74" + integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w== dependencies: - "@babel/template" "^7.6.0" - "@babel/traverse" "^7.6.0" - "@babel/types" "^7.6.0" + "@babel/helper-function-name" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + +"@babel/helpers@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b" + integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g== + dependencies: + "@babel/template" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" "@babel/highlight@^7.0.0": version "7.5.0" @@ -305,27 +410,32 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.0.tgz#3e05d0647432a8326cb28d0de03895ae5a57f39b" integrity sha512-+o2q111WEx4srBs7L9eJmcwi655eD8sXniLqMB93TBK9GrNzGrxDWSjiqz2hLU0Ha8MTXFIP0yd9fNdP+m43ZQ== -"@babel/plugin-proposal-async-generator-functions@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" - integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ== +"@babel/parser@^7.7.0", "@babel/parser@^7.7.2": + version "7.7.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043" + integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A== + +"@babel/plugin-proposal-async-generator-functions@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz#83ef2d6044496b4c15d8b4904e2219e6dccc6971" + integrity sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" + "@babel/helper-remap-async-to-generator" "^7.7.0" "@babel/plugin-syntax-async-generators" "^7.2.0" -"@babel/plugin-proposal-class-properties@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" - integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== +"@babel/plugin-proposal-class-properties@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz#ac54e728ecf81d90e8f4d2a9c05a890457107917" + integrity sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A== dependencies: - "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-create-class-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-proposal-dynamic-import@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506" - integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw== +"@babel/plugin-proposal-dynamic-import@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz#dc02a8bad8d653fb59daf085516fa416edd2aa7f" + integrity sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-dynamic-import" "^7.2.0" @@ -338,10 +448,10 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-json-strings" "^7.2.0" -"@babel/plugin-proposal-object-rest-spread@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58" - integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw== +"@babel/plugin-proposal-object-rest-spread@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096" + integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-object-rest-spread" "^7.2.0" @@ -354,14 +464,13 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" -"@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78" - integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA== +"@babel/plugin-proposal-unicode-property-regex@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz#549fe1717a1bd0a2a7e63163841cb37e78179d5d" + integrity sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" "@babel/plugin-syntax-async-generators@^7.2.0": version "7.2.0" @@ -398,6 +507,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-syntax-top-level-await@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz#f5699549f50bbe8d12b1843a4e82f0a37bb65f4d" + integrity sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-transform-arrow-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550" @@ -405,14 +521,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-async-to-generator@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" - integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== +"@babel/plugin-transform-async-to-generator@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz#e2b84f11952cf5913fe3438b7d2585042772f492" + integrity sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" + "@babel/helper-remap-async-to-generator" "^7.7.0" "@babel/plugin-transform-block-scoped-functions@^7.2.0": version "7.2.0" @@ -421,26 +537,26 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.0.tgz#c49e21228c4bbd4068a35667e6d951c75439b1dc" - integrity sha512-tIt4E23+kw6TgL/edACZwP1OUKrjOTyMrFMLoT5IOFrfMRabCgekjqFd5o6PaAMildBu46oFkekIdMuGkkPEpA== +"@babel/plugin-transform-block-scoping@^7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a" + integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" - integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== +"@babel/plugin-transform-classes@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz#b411ecc1b8822d24b81e5d184f24149136eddd4a" + integrity sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-define-map" "^7.5.5" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.0" + "@babel/helper-define-map" "^7.7.0" + "@babel/helper-function-name" "^7.7.0" + "@babel/helper-optimise-call-expression" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.2.0": @@ -457,14 +573,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3" - integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg== +"@babel/plugin-transform-dotall-regex@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b" + integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" "@babel/plugin-transform-duplicate-keys@^7.5.0": version "7.5.0" @@ -488,12 +603,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-function-name@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad" - integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA== +"@babel/plugin-transform-function-name@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz#0fa786f1eef52e3b7d4fc02e54b2129de8a04c2a" + integrity sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA== dependencies: - "@babel/helper-function-name" "^7.1.0" + "@babel/helper-function-name" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-transform-literals@^7.2.0": @@ -519,39 +634,39 @@ "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" - integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== +"@babel/plugin-transform-modules-commonjs@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz#3e5ffb4fd8c947feede69cbe24c9554ab4113fe3" + integrity sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg== dependencies: - "@babel/helper-module-transforms" "^7.4.4" + "@babel/helper-module-transforms" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" + "@babel/helper-simple-access" "^7.7.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.5.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" - integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== +"@babel/plugin-transform-modules-systemjs@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz#9baf471213af9761c1617bb12fd278e629041417" + integrity sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg== dependencies: - "@babel/helper-hoist-variables" "^7.4.4" + "@babel/helper-hoist-variables" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-umd@^7.2.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae" - integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== +"@babel/plugin-transform-modules-umd@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz#d62c7da16670908e1d8c68ca0b5d4c0097b69966" + integrity sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA== dependencies: - "@babel/helper-module-transforms" "^7.1.0" + "@babel/helper-module-transforms" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-named-capturing-groups-regex@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.0.tgz#1e6e663097813bb4f53d42df0750cf28ad3bb3f1" - integrity sha512-jem7uytlmrRl3iCAuQyw8BpB4c4LWvSpvIeXKpMb+7j84lkx4m4mYr5ErAcmN5KM7B6BqrAvRGjBIbbzqCczew== +"@babel/plugin-transform-named-capturing-groups-regex@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz#358e6fd869b9a4d8f5cbc79e4ed4fc340e60dcaf" + integrity sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg== dependencies: - regexp-tree "^0.1.13" + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/plugin-transform-new-target@^7.4.4": version "7.4.4" @@ -584,10 +699,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-regenerator@^7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f" - integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA== +"@babel/plugin-transform-regenerator@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz#f1b20b535e7716b622c99e989259d7dd942dd9cc" + integrity sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg== dependencies: regenerator-transform "^0.14.0" @@ -598,6 +713,16 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" +"@babel/plugin-transform-runtime@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz#2669f67c1fae0ae8d8bf696e4263ad52cb98b6f8" + integrity sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-plugin-utils" "^7.0.0" + resolve "^1.8.1" + semver "^5.5.1" + "@babel/plugin-transform-shorthand-properties@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" @@ -605,10 +730,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-spread@^7.2.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406" - integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w== +"@babel/plugin-transform-spread@^7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd" + integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -635,83 +760,90 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-unicode-regex@^7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f" - integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA== +"@babel/plugin-transform-unicode-regex@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz#743d9bcc44080e3cc7d49259a066efa30f9187a3" + integrity sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.5.4" -"@babel/preset-env@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz#aae4141c506100bb2bfaa4ac2a5c12b395619e50" - integrity sha512-1efzxFv/TcPsNXlRhMzRnkBFMeIqBBgzwmZwlFDw5Ubj0AGLeufxugirwZmkkX/ayi3owsSqoQ4fw8LkfK9SYg== +"@babel/preset-env@^7.7.1": + version "7.7.1" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.1.tgz#04a2ff53552c5885cf1083e291c8dd5490f744bb" + integrity sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-async-generator-functions" "^7.2.0" - "@babel/plugin-proposal-dynamic-import" "^7.5.0" + "@babel/plugin-proposal-async-generator-functions" "^7.7.0" + "@babel/plugin-proposal-dynamic-import" "^7.7.0" "@babel/plugin-proposal-json-strings" "^7.2.0" - "@babel/plugin-proposal-object-rest-spread" "^7.5.5" + "@babel/plugin-proposal-object-rest-spread" "^7.6.2" "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.7.0" "@babel/plugin-syntax-async-generators" "^7.2.0" "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-syntax-json-strings" "^7.2.0" "@babel/plugin-syntax-object-rest-spread" "^7.2.0" "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" + "@babel/plugin-syntax-top-level-await" "^7.7.0" "@babel/plugin-transform-arrow-functions" "^7.2.0" - "@babel/plugin-transform-async-to-generator" "^7.5.0" + "@babel/plugin-transform-async-to-generator" "^7.7.0" "@babel/plugin-transform-block-scoped-functions" "^7.2.0" - "@babel/plugin-transform-block-scoping" "^7.6.0" - "@babel/plugin-transform-classes" "^7.5.5" + "@babel/plugin-transform-block-scoping" "^7.6.3" + "@babel/plugin-transform-classes" "^7.7.0" "@babel/plugin-transform-computed-properties" "^7.2.0" "@babel/plugin-transform-destructuring" "^7.6.0" - "@babel/plugin-transform-dotall-regex" "^7.4.4" + "@babel/plugin-transform-dotall-regex" "^7.7.0" "@babel/plugin-transform-duplicate-keys" "^7.5.0" "@babel/plugin-transform-exponentiation-operator" "^7.2.0" "@babel/plugin-transform-for-of" "^7.4.4" - "@babel/plugin-transform-function-name" "^7.4.4" + "@babel/plugin-transform-function-name" "^7.7.0" "@babel/plugin-transform-literals" "^7.2.0" "@babel/plugin-transform-member-expression-literals" "^7.2.0" "@babel/plugin-transform-modules-amd" "^7.5.0" - "@babel/plugin-transform-modules-commonjs" "^7.6.0" - "@babel/plugin-transform-modules-systemjs" "^7.5.0" - "@babel/plugin-transform-modules-umd" "^7.2.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.0" + "@babel/plugin-transform-modules-commonjs" "^7.7.0" + "@babel/plugin-transform-modules-systemjs" "^7.7.0" + "@babel/plugin-transform-modules-umd" "^7.7.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.0" "@babel/plugin-transform-new-target" "^7.4.4" "@babel/plugin-transform-object-super" "^7.5.5" "@babel/plugin-transform-parameters" "^7.4.4" "@babel/plugin-transform-property-literals" "^7.2.0" - "@babel/plugin-transform-regenerator" "^7.4.5" + "@babel/plugin-transform-regenerator" "^7.7.0" "@babel/plugin-transform-reserved-words" "^7.2.0" "@babel/plugin-transform-shorthand-properties" "^7.2.0" - "@babel/plugin-transform-spread" "^7.2.0" + "@babel/plugin-transform-spread" "^7.6.2" "@babel/plugin-transform-sticky-regex" "^7.2.0" "@babel/plugin-transform-template-literals" "^7.4.4" "@babel/plugin-transform-typeof-symbol" "^7.2.0" - "@babel/plugin-transform-unicode-regex" "^7.4.4" - "@babel/types" "^7.6.0" + "@babel/plugin-transform-unicode-regex" "^7.7.0" + "@babel/types" "^7.7.1" browserslist "^4.6.0" core-js-compat "^3.1.1" invariant "^2.2.2" js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/register@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.6.0.tgz#76b6f466714680f4becafd45beeb2a7b87431abf" - integrity sha512-78BomdN8el+x/nkup9KwtjJXuptW5oXMFmP11WoM2VJBjxrKv4grC3qjpLL8RGGUYUGsm57xnjYFM2uom+jWUQ== +"@babel/register@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.0.tgz#4e23ecf840296ef79c605baaa5c89e1a2426314b" + integrity sha512-HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg== dependencies: find-cache-dir "^2.0.0" lodash "^4.17.13" - mkdirp "^0.5.1" + make-dir "^2.1.0" pirates "^4.0.0" - source-map-support "^0.5.9" + source-map-support "^0.5.16" + +"@babel/runtime@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a" + integrity sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw== + dependencies: + regenerator-runtime "^0.13.2" -"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0": +"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6" integrity sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ== @@ -720,7 +852,16 @@ "@babel/parser" "^7.6.0" "@babel/types" "^7.6.0" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.0": +"@babel/template@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0" + integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/parser" "^7.7.0" + "@babel/types" "^7.7.0" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.0.tgz#389391d510f79be7ce2ddd6717be66d3fed4b516" integrity sha512-93t52SaOBgml/xY74lsmt7xOR4ufYvhb5c5qiM6lu4J/dWGMAfAh6eKw4PjLes6DI6nQgearoxnFJk60YchpvQ== @@ -735,7 +876,22 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0": +"@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09" + integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.7.2" + "@babel/helper-function-name" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" + "@babel/parser" "^7.7.2" + "@babel/types" "^7.7.2" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + +"@babel/types@^7.0.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0": version "7.6.1" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648" integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g== @@ -744,6 +900,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.7.0", "@babel/types@^7.7.1", "@babel/types@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7" + integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@evocateur/libnpmaccess@^3.1.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@evocateur/libnpmaccess/-/libnpmaccess-3.1.2.tgz#ecf7f6ce6b004e9f942b098d92200be4a4b1c845" @@ -818,6 +983,238 @@ unique-filename "^1.1.1" which "^1.3.1" +"@jimp/bmp@link:packages/type-bmp": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + bmp-js "^0.1.0" + core-js "^3.4.1" + +"@jimp/core@link:packages/core": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + any-base "^1.1.0" + buffer "^5.2.0" + core-js "^3.4.1" + exif-parser "^0.1.12" + file-type "^9.0.0" + load-bmfont "^1.3.1" + mkdirp "0.5.1" + phin "^2.9.1" + pixelmatch "^4.0.2" + tinycolor2 "^1.4.1" + +"@jimp/custom@link:packages/custom": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/core" "link:packages/core" + core-js "^3.4.1" + +"@jimp/gif@link:packages/type-gif": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + omggif "^1.0.9" + +"@jimp/jpeg@link:packages/type-jpeg": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + jpeg-js "^0.3.4" + +"@jimp/plugin-blit@link:packages/plugin-blit": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-blur@link:packages/plugin-blur": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-color@link:packages/plugin-color": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + tinycolor2 "^1.4.1" + +"@jimp/plugin-contain@link:packages/plugin-contain": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-cover@link:packages/plugin-cover": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-crop@link:packages/plugin-crop": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-displace@link:packages/plugin-displace": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-dither@link:packages/plugin-dither": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-flip@link:packages/plugin-flip": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-gaussian@link:packages/plugin-gaussian": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-invert@link:packages/plugin-invert": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-mask@link:packages/plugin-mask": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-normalize@link:packages/plugin-normalize": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-print@link:packages/plugin-print": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + load-bmfont "^1.4.0" + +"@jimp/plugin-resize@link:packages/plugin-resize": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-rotate@link:packages/plugin-rotate": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugin-scale@link:packages/plugin-scale": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + +"@jimp/plugins@link:packages/plugins": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/plugin-blit" "link:packages/plugin-blit" + "@jimp/plugin-blur" "link:packages/plugin-blur" + "@jimp/plugin-color" "link:packages/plugin-color" + "@jimp/plugin-contain" "link:packages/plugin-contain" + "@jimp/plugin-cover" "link:packages/plugin-cover" + "@jimp/plugin-crop" "link:packages/plugin-crop" + "@jimp/plugin-displace" "link:packages/plugin-displace" + "@jimp/plugin-dither" "link:packages/plugin-dither" + "@jimp/plugin-flip" "link:packages/plugin-flip" + "@jimp/plugin-gaussian" "link:packages/plugin-gaussian" + "@jimp/plugin-invert" "link:packages/plugin-invert" + "@jimp/plugin-mask" "link:packages/plugin-mask" + "@jimp/plugin-normalize" "link:packages/plugin-normalize" + "@jimp/plugin-print" "link:packages/plugin-print" + "@jimp/plugin-resize" "link:packages/plugin-resize" + "@jimp/plugin-rotate" "link:packages/plugin-rotate" + "@jimp/plugin-scale" "link:packages/plugin-scale" + core-js "^3.4.1" + timm "^1.6.1" + +"@jimp/png@link:packages/type-png": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + core-js "^3.4.1" + pngjs "^3.3.3" + +"@jimp/test-utils@link:packages/test-utils": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + core-js "^3.4.1" + pngjs "^3.3.3" + +"@jimp/tiff@link:packages/type-tiff": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + core-js "^3.4.1" + utif "^2.0.1" + +"@jimp/types@link:packages/types": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/bmp" "link:packages/type-bmp" + "@jimp/gif" "link:packages/type-gif" + "@jimp/jpeg" "link:packages/type-jpeg" + "@jimp/png" "link:packages/type-png" + "@jimp/tiff" "link:packages/type-tiff" + core-js "^3.4.1" + timm "^1.6.1" + +"@jimp/utils@link:packages/utils": + version "0.9.1" + dependencies: + "@babel/runtime" "^7.7.2" + core-js "^3.4.1" + "@lerna/add@3.16.2": version "3.16.2" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.16.2.tgz#90ecc1be7051cfcec75496ce122f656295bd6e94" @@ -3158,6 +3555,13 @@ convert-source-map@^1.1.0, convert-source-map@^1.1.3, convert-source-map@^1.6.0: dependencies: safe-buffer "~5.1.1" +convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + convert-source-map@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" @@ -3221,15 +3625,16 @@ core-js@^2.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== -core-js@^2.5.7: - version "2.5.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" - core-js@^3.1.3: version "3.2.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw== +core-js@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.1.tgz#76dd6828412900ab27c8ce0b22e6114d7ce21b18" + integrity sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -7713,15 +8118,6 @@ outpipe@^1.1.0: dependencies: shell-quote "^1.4.2" -output-file-sync@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0" - integrity sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ== - dependencies: - graceful-fs "^4.1.11" - is-plain-obj "^1.1.0" - mkdirp "^0.5.1" - p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" @@ -8655,7 +9051,7 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== -regenerator-runtime@^0.13.3: +regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3: version "0.13.3" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== @@ -8675,7 +9071,7 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp-tree@^0.1.13, regexp-tree@~0.1.1: +regexp-tree@~0.1.1: version "0.1.13" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz#5b19ab9377edc68bc3679256840bb29afc158d7f" integrity sha512-hwdV/GQY5F8ReLZWO+W1SRoN5YfpOKY6852+tBFcma72DKBIcHjPRIlIvQN35bCOljuAfP2G2iB0FC/w236mUw== @@ -8685,7 +9081,7 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpu-core@^4.5.4: +regexpu-core@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== @@ -9293,7 +9689,15 @@ source-map-support@^0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@^0.5.6, source-map-support@^0.5.9: +source-map-support@^0.5.16: + version "0.5.16" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" + integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@^0.5.6: version "0.5.9" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" dependencies: From 5289eba3d4dbbbb6d176face58801afe204fd4af Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 20:23:59 +0000 Subject: [PATCH 032/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 505602232..431228e50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +# v0.9.2 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@SaWey](https://github.com/SaWey) [@hipstersmoothie](https://github.com/hipstersmoothie)) +- `@jimp/core` + - Follow redirects [#789](https://github.com/oliver-moran/jimp/pull/789) ([@SaWey](https://github.com/SaWey) sander@solora.be) + +#### Authors: 3 + +- Sander Weyens ([@SaWey](https://github.com/SaWey)) +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- sander (sander@solora.be) + +--- + # v0.9.1 (Tue Nov 26 2019) #### 🐛 Bug Fix From d93c8cd9dce237b4117c075a3a3392fea200c7a5 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 20:24:01 +0000 Subject: [PATCH 033/223] Bump version to: 0.9.2 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/custom/package.json | 6 +++--- packages/jimp/package.json | 4 ++-- packages/plugin-blit/package.json | 6 +++--- packages/plugin-blur/package.json | 6 +++--- packages/plugin-circle/package.json | 6 +++--- packages/plugin-color/package.json | 4 ++-- packages/plugin-contain/package.json | 6 +++--- packages/plugin-cover/package.json | 6 +++--- packages/plugin-crop/package.json | 6 +++--- packages/plugin-displace/package.json | 6 +++--- packages/plugin-dither/package.json | 6 +++--- packages/plugin-fisheye/package.json | 6 +++--- packages/plugin-flip/package.json | 6 +++--- packages/plugin-gaussian/package.json | 6 +++--- packages/plugin-invert/package.json | 6 +++--- packages/plugin-mask/package.json | 6 +++--- packages/plugin-normalize/package.json | 6 +++--- packages/plugin-print/package.json | 4 ++-- packages/plugin-resize/package.json | 6 +++--- packages/plugin-rotate/package.json | 6 +++--- packages/plugin-scale/package.json | 6 +++--- packages/plugin-shadow/package.json | 6 +++--- packages/plugin-threshold/package.json | 6 +++--- packages/plugins/package.json | 4 ++-- packages/test-utils/package.json | 4 ++-- packages/type-bmp/package.json | 6 +++--- packages/type-gif/package.json | 4 ++-- packages/type-jpeg/package.json | 4 ++-- packages/type-png/package.json | 4 ++-- packages/type-tiff/package.json | 4 ++-- packages/types/package.json | 4 ++-- packages/utils/package.json | 6 +++--- 35 files changed, 91 insertions(+), 91 deletions(-) diff --git a/lerna.json b/lerna.json index d8a450d0f..3a854abfd 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.1" + "version": "0.9.2" } diff --git a/packages/cli/package.json b/packages/cli/package.json index c269e7403..b2a686e85 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.1", + "version": "0.9.2", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.1", + "jimp": "^0.9.2", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 118224b0b..c490bfa59 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.1", + "version": "0.9.2", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -34,11 +34,11 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "any-base": "^1.1.0", "buffer": "^5.2.0", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "exif-parser": "^0.1.12", "file-type": "^9.0.0", "load-bmfont": "^1.3.1", diff --git a/packages/custom/package.json b/packages/custom/package.json index a41aaca6d..b75b8d61d 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.1", + "version": "0.9.2", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/core": "link:../core", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "publishConfig": { "access": "public" diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 307348fe1..7a2d4bcf6 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.1", + "version": "0.9.2", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -59,11 +59,11 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/custom": "link:../custom", "@jimp/plugins": "link:../plugins", "@jimp/types": "link:../types", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "regenerator-runtime": "^0.13.3" }, "devDependencies": { diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 342522dd4..42b940074 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.1", + "version": "0.9.2", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "devDependencies": { "@jimp/custom": "link:../custom", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 755e7bc7a..18daa669f 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.1", + "version": "0.9.2", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 9d05f135a..ab1225cc3 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.1", + "version": "0.9.2", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 53d515e07..fa0570780 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.1", + "version": "0.9.2", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "tinycolor2": "^1.4.1" }, "devDependencies": { diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index c44d5e836..955537c92 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.1", + "version": "0.9.2", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 3d9ba4558..79e8584b4 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.1", + "version": "0.9.2", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 1bd31a15d..7d31adc54 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.1", + "version": "0.9.2", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "devDependencies": { "@jimp/custom": "link:../custom", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index bbeb057dd..b61a18351 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.1", + "version": "0.9.2", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 92af6cfaf..e102399b8 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.1", + "version": "0.9.2", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 77eee5a23..5e832850d 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.1", + "version": "0.9.2", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 7e4ccc514..7996ac076 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.1", + "version": "0.9.2", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 4aa00f3bc..32e5386d6 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.1", + "version": "0.9.2", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 78bb6f9b4..3f4b0e607 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.1", + "version": "0.9.2", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 79b2ad262..f4d1421a1 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.1", + "version": "0.9.2", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index cf8f78cab..9041495e3 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.1", + "version": "0.9.2", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index a8c03be50..58f58f015 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.1", + "version": "0.9.2", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "load-bmfont": "^1.4.0" }, "peerDependencies": { diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 5a1d5fd2b..53c2bf467 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.1", + "version": "0.9.2", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 5a93a3935..4e68187c0 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.1", + "version": "0.9.2", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 7e0a2580f..d4e2fe013 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.1", + "version": "0.9.2", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 51683f479..b7c78d3e7 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.1", + "version": "0.9.2", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 203f9108e..d67891800 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.1", + "version": "0.9.2", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 2eb98ea04..cd0d1bf7c 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -17,6 +17,7 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/plugin-blit": "link:../plugin-blit", "@jimp/plugin-blur": "link:../plugin-blur", "@jimp/plugin-color": "link:../plugin-color", @@ -35,7 +36,6 @@ "@jimp/plugin-rotate": "link:../plugin-rotate", "@jimp/plugin-scale": "link:../plugin-scale", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "timm": "^1.6.1" }, "peerDependencies": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 1bc7c5b13..0b467c80a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.1", + "version": "0.9.2", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -22,8 +22,8 @@ "access": "public" }, "dependencies": { - "core-js": "^3.4.1", "@babel/runtime": "^7.7.2", + "core-js": "^3.4.1", "pngjs": "^3.3.3" }, "devDependencies": { diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index f869ac5fb..66291f45f 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,10 +20,10 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "bmp-js": "^0.1.0", - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "core-js": "^3.4.1" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 36b053997..a62b9d9aa 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -17,9 +17,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "omggif": "^1.0.9" }, "peerDependencies": { diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 3cffe7341..e2d026850 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "jpeg-js": "^0.3.4" }, "peerDependencies": { diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 8cc794fc0..90bd9db2c 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,9 +20,9 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "pngjs": "^3.3.3" }, "peerDependencies": { diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 540818834..b4e88e2a0 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -20,8 +20,8 @@ "author": "", "license": "MIT", "dependencies": { - "core-js": "^3.4.1", "@babel/runtime": "^7.7.2", + "core-js": "^3.4.1", "utif": "^2.0.1" }, "peerDependencies": { diff --git a/packages/types/package.json b/packages/types/package.json index c12219774..394aa89cb 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.1", + "version": "0.9.2", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -17,13 +17,13 @@ "author": "", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.7.2", "@jimp/bmp": "link:../type-bmp", "@jimp/gif": "link:../type-gif", "@jimp/jpeg": "link:../type-jpeg", "@jimp/png": "link:../type-png", "@jimp/tiff": "link:../type-tiff", "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2", "timm": "^1.6.1" }, "peerDependencies": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 64435001d..f3fef0428 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.1", + "version": "0.9.2", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -20,7 +20,7 @@ "access": "public" }, "dependencies": { - "core-js": "^3.4.1", - "@babel/runtime": "^7.7.2" + "@babel/runtime": "^7.7.2", + "core-js": "^3.4.1" } } From c4b621f05469780493fb040f5704b8b7679fcfa6 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 13:19:27 -0800 Subject: [PATCH 034/223] update auto (#824) --- CHANGELOG.md | 5 +- package.json | 2 +- yarn.lock | 328 ++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 302 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 431228e50..89f13f75b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ # v0.9.2 (Tue Nov 26 2019) -#### 🐛 Bug Fix +#### 🐛 Bug Fix - `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` - - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@SaWey](https://github.com/SaWey) [@hipstersmoothie](https://github.com/hipstersmoothie)) + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) - `@jimp/core` - Follow redirects [#789](https://github.com/oliver-moran/jimp/pull/789) ([@SaWey](https://github.com/SaWey) sander@solora.be) #### Authors: 3 - Sander Weyens ([@SaWey](https://github.com/SaWey)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) - Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) - sander (sander@solora.be) diff --git a/package.json b/package.json index 76a43de47..5a64b0d6a 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@babel/preset-env": "^7.7.1", "@babel/register": "^7.7.0", "@babel/runtime": "^7.7.2", - "auto": "^7.6.0", + "auto": "^7.16.3", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-istanbul": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index 7367df8a9..8f3e12fb7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,36 @@ resolved "https://registry.yarnpkg.com/@atomist/slack-messages/-/slack-messages-1.1.1.tgz#9de42932e89065fb4fe4842978ca2d1ed3424cea" integrity sha512-m2OzlTDbhvzK4hgswH9Lx0cdpq1AntXu53Klz5RGkFfuoDvKsnlU7tmtVfNWtUiP0zZbGtrb/BZYH7aB6TRnMA== +"@auto-it/core@^7.16.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-7.16.3.tgz#4e2926501793ee65166e2f735bc802210da43a43" + integrity sha512-D4T3PfFb/A8I0VoTAxzS3zmIv1IGH3g2sD3EZSC5Fw2QEnWBCflRnuQ7mgnVDN7qc8/ykt7qPrk7LiCmJnY8Lg== + dependencies: + "@octokit/graphql" "^4.0.0" + "@octokit/plugin-enterprise-compatibility" "1.1.1" + "@octokit/plugin-retry" "^2.2.0" + "@octokit/plugin-throttling" "^2.6.0" + "@octokit/rest" "16.35.0" + await-to-js "^2.1.1" + cosmiconfig "6.0.0" + dedent "^0.7.0" + deepmerge "^4.0.0" + dotenv "^8.0.0" + enquirer "^2.3.0" + env-ci "^4.1.1" + gitlog "^3.1.2" + https-proxy-agent "^3.0.0" + import-cwd "^3.0.0" + lodash.chunk "^4.2.0" + node-fetch "2.6.0" + semver "^6.0.0" + signale "^1.4.0" + tapable "^2.0.0-beta.2" + tinycolor2 "^1.4.1" + tslib "1.10.0" + typescript-memoize "^1.0.0-alpha.3" + url-join "^4.0.0" + "@auto-it/core@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-7.6.0.tgz#5b155e5f09ba2e8a190a7569419a3e9ca7165415" @@ -36,6 +66,23 @@ typescript-memoize "^1.0.0-alpha.3" url-join "^4.0.0" +"@auto-it/npm@^7.16.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-7.16.3.tgz#313f18701150f84dc5b19b3bcbd0c413edcb0a87" + integrity sha512-fr3NL4rCH3XvwXiwXFbRPcf2auJXNS6uAjl9ALr1igC/cTCzuX4tZk7XIjQ3vdguJmD+F9+VfmHFOsUoPMB56A== + dependencies: + "@auto-it/core" "^7.16.3" + env-ci "^4.1.1" + get-monorepo-packages "^1.1.0" + parse-author "^2.0.0" + parse-github-url "1.0.2" + registry-url "^5.1.0" + semver "^6.0.0" + tslib "1.10.0" + typescript-memoize "^1.0.0-alpha.3" + url-join "^4.0.0" + user-home "^2.0.0" + "@auto-it/npm@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-7.6.0.tgz#8f8cde72427e76885a626f3a07fc166a11ca57e1" @@ -52,6 +99,15 @@ url-join "^4.0.0" user-home "^2.0.0" +"@auto-it/released@^7.16.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-7.16.3.tgz#35acef5d78dad875c6e0eac9cc94cabff6511aa2" + integrity sha512-yDdaCYaTGvvnAM7yfHd6LR/vm9Iad2IxIGceNBP7wohDBjmwXqIbHeZASr8lSVpjoo1r3gUOZgUJfynItgS+dg== + dependencies: + "@auto-it/core" "^7.16.3" + deepmerge "^4.0.0" + tslib "1.10.0" + "@auto-it/released@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-7.6.0.tgz#8a2db26691a7294ad887ec492c094c5d3e69f6fd" @@ -836,6 +892,13 @@ pirates "^4.0.0" source-map-support "^0.5.16" +"@babel/runtime@^7.6.3": + version "7.7.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.4.tgz#b23a856751e4bf099262f867767889c0e3fe175b" + integrity sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw== + dependencies: + regenerator-runtime "^0.13.2" + "@babel/runtime@^7.7.2": version "7.7.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a" @@ -984,7 +1047,7 @@ which "^1.3.1" "@jimp/bmp@link:packages/type-bmp": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -992,7 +1055,7 @@ core-js "^3.4.1" "@jimp/core@link:packages/core": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1008,14 +1071,14 @@ tinycolor2 "^1.4.1" "@jimp/custom@link:packages/custom": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/core" "link:packages/core" core-js "^3.4.1" "@jimp/gif@link:packages/type-gif": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1023,7 +1086,7 @@ omggif "^1.0.9" "@jimp/jpeg@link:packages/type-jpeg": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1031,21 +1094,21 @@ jpeg-js "^0.3.4" "@jimp/plugin-blit@link:packages/plugin-blit": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-blur@link:packages/plugin-blur": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-color@link:packages/plugin-color": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1053,77 +1116,77 @@ tinycolor2 "^1.4.1" "@jimp/plugin-contain@link:packages/plugin-contain": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-cover@link:packages/plugin-cover": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-crop@link:packages/plugin-crop": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-displace@link:packages/plugin-displace": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-dither@link:packages/plugin-dither": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-flip@link:packages/plugin-flip": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-gaussian@link:packages/plugin-gaussian": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-invert@link:packages/plugin-invert": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-mask@link:packages/plugin-mask": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-normalize@link:packages/plugin-normalize": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-print@link:packages/plugin-print": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1131,28 +1194,28 @@ load-bmfont "^1.4.0" "@jimp/plugin-resize@link:packages/plugin-resize": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-rotate@link:packages/plugin-rotate": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-scale@link:packages/plugin-scale": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugins@link:packages/plugins": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/plugin-blit" "link:packages/plugin-blit" @@ -1176,7 +1239,7 @@ timm "^1.6.1" "@jimp/png@link:packages/type-png": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1184,21 +1247,21 @@ pngjs "^3.3.3" "@jimp/test-utils@link:packages/test-utils": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" pngjs "^3.3.3" "@jimp/tiff@link:packages/type-tiff": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" utif "^2.0.1" "@jimp/types@link:packages/types": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" "@jimp/bmp" "link:packages/type-bmp" @@ -1210,7 +1273,7 @@ timm "^1.6.1" "@jimp/utils@link:packages/utils": - version "0.9.1" + version "0.9.2" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" @@ -1935,6 +1998,15 @@ is-plain-object "^3.0.0" universal-user-agent "^4.0.0" +"@octokit/endpoint@^5.5.0": + version "5.5.1" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.5.1.tgz#2eea81e110ca754ff2de11c79154ccab4ae16b3f" + integrity sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg== + dependencies: + "@octokit/types" "^2.0.0" + is-plain-object "^3.0.0" + universal-user-agent "^4.0.0" + "@octokit/graphql@^4.0.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.2.0.tgz#99e739f3cba12ab83136a8a82fffdbfa0715ed28" @@ -1943,7 +2015,7 @@ "@octokit/request" "^5.0.0" universal-user-agent "^4.0.0" -"@octokit/plugin-enterprise-compatibility@^1.1.1": +"@octokit/plugin-enterprise-compatibility@1.1.1", "@octokit/plugin-enterprise-compatibility@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-compatibility/-/plugin-enterprise-compatibility-1.1.1.tgz#1d4189d588eccb1bbc23cd72278129491cfba5d2" integrity sha512-/o09y5I1JJMGGTU2y//QXBKjILX0BaDgBK27NRBJPRxD4BsDVzIsRFQm7ejPWW3l2xOao8tvN7Yh73D5cXBBbg== @@ -1988,6 +2060,20 @@ once "^1.4.0" universal-user-agent "^4.0.0" +"@octokit/request@^5.2.0": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.3.1.tgz#3a1ace45e6f88b1be4749c5da963b3a3b4a2f120" + integrity sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg== + dependencies: + "@octokit/endpoint" "^5.5.0" + "@octokit/request-error" "^1.0.1" + "@octokit/types" "^2.0.0" + deprecation "^2.0.0" + is-plain-object "^3.0.0" + node-fetch "^2.3.0" + once "^1.4.0" + universal-user-agent "^4.0.0" + "@octokit/rest@16.28.7": version "16.28.7" resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.28.7.tgz#a2c2db5b318da84144beba82d19c1a9dbdb1a1fa" @@ -2007,6 +2093,24 @@ universal-user-agent "^3.0.0" url-template "^2.0.8" +"@octokit/rest@16.35.0": + version "16.35.0" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.35.0.tgz#7ccc1f802f407d5b8eb21768c6deca44e7b4c0d8" + integrity sha512-9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w== + dependencies: + "@octokit/request" "^5.2.0" + "@octokit/request-error" "^1.0.2" + atob-lite "^2.0.0" + before-after-hook "^2.0.0" + btoa-lite "^1.0.0" + deprecation "^2.0.0" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lodash.uniq "^4.5.0" + octokit-pagination-methods "^1.1.0" + once "^1.4.0" + universal-user-agent "^4.0.0" + "@octokit/rest@^16.28.4": version "16.29.0" resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.29.0.tgz#5bbbfc818a44bb9ab32bee72cc0acc32e4556058" @@ -2025,6 +2129,13 @@ once "^1.4.0" universal-user-agent "^4.0.0" +"@octokit/types@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.0.2.tgz#0888497f5a664e28b0449731d5e88e19b2a74f90" + integrity sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ== + dependencies: + "@types/node" ">= 8" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -2032,6 +2143,21 @@ dependencies: any-observable "^0.3.0" +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + +"@types/command-line-args@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/command-line-args/-/command-line-args-5.0.0.tgz#484e704d20dbb8754a8f091eee45cdd22bcff28c" + integrity sha512-4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg== + +"@types/command-line-usage@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@types/command-line-usage/-/command-line-usage-5.0.1.tgz#99424950da567ba67b6b65caee57ff03c4e751ec" + integrity sha512-/xUgezxxYePeXhg5S04hUjxG9JZi+rJTs1+4NwpYPfSaS7BeDa6tVJkH6lN9Cb6rl8d24Fi2uX0s0Ngg2JT6gg== + "@types/events@*": version "3.0.0" resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" @@ -2066,11 +2192,21 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f" integrity sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w== +"@types/node@>= 8": + version "12.12.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2" + integrity sha512-u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + "@types/parsimmon@^1.3.0": version "1.10.0" resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.0.tgz#ffb81cb023ff435a41d4710a29ab23c561dc9fdf" @@ -2233,6 +2369,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172" + integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + any-base@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" @@ -2320,6 +2464,11 @@ array-back@^3.0.1, array-back@^3.1.0: resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== +array-back@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.1.tgz#9b80312935a52062e1a233a9c7abeb5481b30e90" + integrity sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg== + array-differ@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" @@ -2466,6 +2615,20 @@ author-regex@^1.0.0: resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450" integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA= +auto@^7.16.3: + version "7.16.3" + resolved "https://registry.yarnpkg.com/auto/-/auto-7.16.3.tgz#440b51612bc4b657518b7dce2e398b3f91a040a3" + integrity sha512-654GEfLyGVMVMvS/A13fPAsIvFi1dFiT/s2rDbZGJnzxzHhuEk+ZFURR/GD+ARzSlbPIWB4bd25zg/pzpRLg6g== + dependencies: + "@auto-it/core" "^7.16.3" + "@auto-it/npm" "^7.16.3" + "@auto-it/released" "^7.16.3" + chalk "^3.0.0" + command-line-application "^0.9.3" + dedent "^0.7.0" + signale "^1.4.0" + tslib "1.10.0" + auto@^7.6.0: version "7.6.0" resolved "https://registry.yarnpkg.com/auto/-/auto-7.6.0.tgz#bb9178e38057e53047cfd0bc0ae2611afe2a09a1" @@ -3116,6 +3279,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3 escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -3278,11 +3449,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colors@^1.1.0: version "1.3.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d" @@ -3318,6 +3501,20 @@ command-exists@^1.2.8: resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291" integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw== +command-line-application@^0.9.3: + version "0.9.5" + resolved "https://registry.yarnpkg.com/command-line-application/-/command-line-application-0.9.5.tgz#ae538f549d41f7496cf5d6cf356425c34ed30555" + integrity sha512-dLL/2HDrOScJrZbvAPCNGme9ZR758Uv50mD5nHQz8Y8DE/BgFfSHxlIF9azu+hWtlVpcb0F9CVbo57Omu250Ew== + dependencies: + "@types/command-line-args" "^5.0.0" + "@types/command-line-usage" "^5.0.1" + chalk "^2.4.1" + command-line-args "^5.1.1" + command-line-usage "^6.0.0" + meant "^1.0.1" + remove-markdown "^0.3.0" + tslib "1.10.0" + command-line-args@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a" @@ -3328,6 +3525,16 @@ command-line-args@^5.1.1: lodash.camelcase "^4.3.0" typical "^4.0.0" +command-line-usage@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.0.tgz#f28376a3da3361ff3d36cfd31c3c22c9a64c7cb6" + integrity sha512-Ew1clU4pkUeo6AFVDFxCbnN7GIZfXl48HIOQeFQnkO3oOqvpI7wdqtLRwv9iOCZ/7A+z4csVZeiDdEcj8g6Wiw== + dependencies: + array-back "^4.0.0" + chalk "^2.4.2" + table-layout "^1.0.0" + typical "^5.2.0" + command-line-usage@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.0.2.tgz#b130e3495ae743ce4833e1c9373bbb0898275dda" @@ -3650,6 +3857,17 @@ cosmiconfig@5.2.1, cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: js-yaml "^3.13.1" parse-json "^4.0.0" +cosmiconfig@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.7.2" + cp-file@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" @@ -5627,6 +5845,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" @@ -5803,6 +6026,14 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81" + integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -5889,6 +6120,14 @@ import-fresh@^3.0.0: parent-module "^1.0.0" resolve-from "^4.0.0" +import-fresh@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966" @@ -7243,6 +7482,11 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +meant@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d" + integrity sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" @@ -9134,6 +9378,11 @@ release-zalgo@^1.0.0: dependencies: es6-error "^4.0.1" +remove-markdown@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/remove-markdown/-/remove-markdown-0.3.0.tgz#5e4b667493a93579728f3d52ecc1db9ca505dc98" + integrity sha1-XktmdJOpNXlyjz1S7MHbnKUF3Jg= + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -10062,6 +10311,13 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + dependencies: + has-flag "^4.0.0" + supports-hyperlinks@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7" @@ -10339,7 +10595,7 @@ ts-node@^7.0.1: source-map-support "^0.5.6" yn "^2.0.0" -tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== @@ -10444,6 +10700,11 @@ typical@^5.0.0, typical@^5.1.0: resolved "https://registry.yarnpkg.com/typical/-/typical-5.1.0.tgz#7116ca103caf2574985fc84fbaa8fd0ee5ea1684" integrity sha512-t5Ik8UAwBal1P1XzuVE4dc+RYQZicLUGJdvqr/vdqsED7SQECgsGBylldSsfWZL7RQjxT3xhQcKHWhLaVSR6YQ== +typical@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" + integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== + uglify-js@^3.1.4, uglify-js@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5" @@ -11026,6 +11287,13 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== +yaml@^1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" + integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== + dependencies: + "@babel/runtime" "^7.6.3" + yargs-parser@13.0.0: version "13.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b" From 951c460ea7026de9ef6f4fbe9767b325f17be653 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 15:10:54 -0800 Subject: [PATCH 035/223] fix automation (#825) * update auto * ignore tests in node_modules * ignore tests in node_modules * correct changelog --- CHANGELOG.md | 3 ++- karma.conf.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f13f75b..b0d9e3a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,7 +52,7 @@ #### 🏠 Internal - `@jimp/cli`, `@jimp/core`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-color`, `@jimp/plugin-crop`, `@jimp/plugin-normalize`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/test-utils`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types` - - Upgrade nearly-all dev deps [#799](https://github.com/oliver-moran/jimp/pull/799) ([@popinguy](https://github.com/popinguy) [@hipstersmoothie](https://github.com/hipstersmoothie)) + - Upgrade nearly-all dev deps [#799](https://github.com/oliver-moran/jimp/pull/799) ([@crutchcorn](https://github.com/crutchcorn)) #### 📝 Documentation @@ -63,6 +63,7 @@ - [@popinguy](https://github.com/popinguy) - Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) - Alexander Shcherbakov (alexander.shcherbakov@btsdigital.kz) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) --- diff --git a/karma.conf.js b/karma.conf.js index b2f00b766..57882dc76 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,5 +1,11 @@ // Karma configuration // Generated on Sat Jan 28 2017 19:40:10 GMT-0300 (BRT) +const { execSync } = require('child_process'); + +const allowed = `?(${execSync('ls packages', { encoding: 'utf8' }) + .trim() + .split('\n') + .join('|')})`; module.exports = function(config) { config.set({ @@ -16,12 +22,12 @@ module.exports = function(config) { }, preprocessors: { - 'packages/**/**/*.js': 'browserify' + [`packages/${allowed}/test/**/*.js`]: 'browserify' }, // list of files / patterns to load in the browser files: [ - './packages/**/test/*.js', + `./packages/${allowed}/test/**/*.test.js`, { pattern: 'packages/**/test/images/**/*', watched: false, From aae91a178b629dcb0218b8c8185ced4a1658c95f Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 23:18:28 +0000 Subject: [PATCH 036/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 22 ++++++++++++++++++++++ packages/cli/CHANGELOG.md | 11 +++++++++++ packages/core/CHANGELOG.md | 13 +++++++++++++ packages/custom/CHANGELOG.md | 11 +++++++++++ packages/jimp/CHANGELOG.md | 11 +++++++++++ packages/plugin-blit/CHANGELOG.md | 11 +++++++++++ packages/plugin-blur/CHANGELOG.md | 11 +++++++++++ packages/plugin-circle/CHANGELOG.md | 11 +++++++++++ packages/plugin-color/CHANGELOG.md | 11 +++++++++++ packages/plugin-contain/CHANGELOG.md | 11 +++++++++++ packages/plugin-cover/CHANGELOG.md | 11 +++++++++++ packages/plugin-crop/CHANGELOG.md | 11 +++++++++++ packages/plugin-displace/CHANGELOG.md | 11 +++++++++++ packages/plugin-dither/CHANGELOG.md | 11 +++++++++++ packages/plugin-fisheye/CHANGELOG.md | 11 +++++++++++ packages/plugin-flip/CHANGELOG.md | 11 +++++++++++ packages/plugin-gaussian/CHANGELOG.md | 11 +++++++++++ packages/plugin-invert/CHANGELOG.md | 11 +++++++++++ packages/plugin-mask/CHANGELOG.md | 11 +++++++++++ packages/plugin-normalize/CHANGELOG.md | 11 +++++++++++ packages/plugin-print/CHANGELOG.md | 11 +++++++++++ packages/plugin-resize/CHANGELOG.md | 11 +++++++++++ packages/plugin-rotate/CHANGELOG.md | 11 +++++++++++ packages/plugin-scale/CHANGELOG.md | 11 +++++++++++ packages/plugin-shadow/CHANGELOG.md | 11 +++++++++++ packages/plugin-threshold/CHANGELOG.md | 11 +++++++++++ packages/plugins/CHANGELOG.md | 11 +++++++++++ packages/test-utils/CHANGELOG.md | 11 +++++++++++ packages/type-bmp/CHANGELOG.md | 11 +++++++++++ packages/type-gif/CHANGELOG.md | 11 +++++++++++ packages/type-jpeg/CHANGELOG.md | 11 +++++++++++ packages/type-png/CHANGELOG.md | 11 +++++++++++ packages/type-tiff/CHANGELOG.md | 11 +++++++++++ packages/types/CHANGELOG.md | 11 +++++++++++ packages/utils/CHANGELOG.md | 10 ++++++++++ 35 files changed, 397 insertions(+) create mode 100644 packages/cli/CHANGELOG.md create mode 100644 packages/core/CHANGELOG.md create mode 100644 packages/custom/CHANGELOG.md create mode 100644 packages/jimp/CHANGELOG.md create mode 100644 packages/plugin-blit/CHANGELOG.md create mode 100644 packages/plugin-blur/CHANGELOG.md create mode 100644 packages/plugin-circle/CHANGELOG.md create mode 100644 packages/plugin-color/CHANGELOG.md create mode 100644 packages/plugin-contain/CHANGELOG.md create mode 100644 packages/plugin-cover/CHANGELOG.md create mode 100644 packages/plugin-crop/CHANGELOG.md create mode 100644 packages/plugin-displace/CHANGELOG.md create mode 100644 packages/plugin-dither/CHANGELOG.md create mode 100644 packages/plugin-fisheye/CHANGELOG.md create mode 100644 packages/plugin-flip/CHANGELOG.md create mode 100644 packages/plugin-gaussian/CHANGELOG.md create mode 100644 packages/plugin-invert/CHANGELOG.md create mode 100644 packages/plugin-mask/CHANGELOG.md create mode 100644 packages/plugin-normalize/CHANGELOG.md create mode 100644 packages/plugin-print/CHANGELOG.md create mode 100644 packages/plugin-resize/CHANGELOG.md create mode 100644 packages/plugin-rotate/CHANGELOG.md create mode 100644 packages/plugin-scale/CHANGELOG.md create mode 100644 packages/plugin-shadow/CHANGELOG.md create mode 100644 packages/plugin-threshold/CHANGELOG.md create mode 100644 packages/plugins/CHANGELOG.md create mode 100644 packages/test-utils/CHANGELOG.md create mode 100644 packages/type-bmp/CHANGELOG.md create mode 100644 packages/type-gif/CHANGELOG.md create mode 100644 packages/type-jpeg/CHANGELOG.md create mode 100644 packages/type-png/CHANGELOG.md create mode 100644 packages/type-tiff/CHANGELOG.md create mode 100644 packages/types/CHANGELOG.md create mode 100644 packages/utils/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index b0d9e3a7f..0ad8ed552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # v0.9.2 (Tue Nov 26 2019) +#### 🐛 Bug Fix + +- fix automation [#825](https://github.com/oliver-moran/jimp/pull/825) ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) +- `@jimp/core` + - Follow redirects [#789](https://github.com/oliver-moran/jimp/pull/789) ([@SaWey](https://github.com/SaWey) sander@solora.be) + +#### 🏠 Internal + +- update auto [#824](https://github.com/oliver-moran/jimp/pull/824) ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 3 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) +- sander (sander@solora.be) + +--- + +# v0.9.2 (Tue Nov 26 2019) + #### 🐛 Bug Fix - `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/cli/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md new file mode 100644 index 000000000..46b829756 --- /dev/null +++ b/packages/core/CHANGELOG.md @@ -0,0 +1,13 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) +- `@jimp/core` + - Follow redirects [#789](https://github.com/oliver-moran/jimp/pull/789) ([@SaWey](https://github.com/SaWey) sander@solora.be) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/custom/CHANGELOG.md b/packages/custom/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/custom/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/jimp/CHANGELOG.md b/packages/jimp/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/jimp/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-blit/CHANGELOG.md b/packages/plugin-blit/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-blit/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-blur/CHANGELOG.md b/packages/plugin-blur/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-blur/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-circle/CHANGELOG.md b/packages/plugin-circle/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-circle/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-color/CHANGELOG.md b/packages/plugin-color/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-color/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-contain/CHANGELOG.md b/packages/plugin-contain/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-contain/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-cover/CHANGELOG.md b/packages/plugin-cover/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-cover/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-crop/CHANGELOG.md b/packages/plugin-crop/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-crop/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-displace/CHANGELOG.md b/packages/plugin-displace/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-displace/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-dither/CHANGELOG.md b/packages/plugin-dither/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-dither/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-fisheye/CHANGELOG.md b/packages/plugin-fisheye/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-fisheye/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-flip/CHANGELOG.md b/packages/plugin-flip/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-flip/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-gaussian/CHANGELOG.md b/packages/plugin-gaussian/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-gaussian/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-invert/CHANGELOG.md b/packages/plugin-invert/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-invert/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-mask/CHANGELOG.md b/packages/plugin-mask/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-mask/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-normalize/CHANGELOG.md b/packages/plugin-normalize/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-normalize/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-print/CHANGELOG.md b/packages/plugin-print/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-print/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-resize/CHANGELOG.md b/packages/plugin-resize/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-resize/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-rotate/CHANGELOG.md b/packages/plugin-rotate/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-rotate/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-scale/CHANGELOG.md b/packages/plugin-scale/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-scale/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-shadow/CHANGELOG.md b/packages/plugin-shadow/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-shadow/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugin-threshold/CHANGELOG.md b/packages/plugin-threshold/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugin-threshold/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/plugins/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/test-utils/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/type-bmp/CHANGELOG.md b/packages/type-bmp/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/type-bmp/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/type-gif/CHANGELOG.md b/packages/type-gif/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/type-gif/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/type-jpeg/CHANGELOG.md b/packages/type-jpeg/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/type-jpeg/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/type-png/CHANGELOG.md b/packages/type-png/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/type-png/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/type-tiff/CHANGELOG.md b/packages/type-tiff/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/type-tiff/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md new file mode 100644 index 000000000..36ecda1a0 --- /dev/null +++ b/packages/types/CHANGELOG.md @@ -0,0 +1,11 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md new file mode 100644 index 000000000..68b402aa5 --- /dev/null +++ b/packages/utils/CHANGELOG.md @@ -0,0 +1,10 @@ +# v0.9.3 (Tue Nov 26 2019) + +#### 🐛 Bug Fix + +- Fix regeneratorRuntime errors [#815](https://github.com/oliver-moran/jimp/pull/815) ([@crutchcorn](https://github.com/crutchcorn) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) \ No newline at end of file From bcba912d188def2e9e5d2ee75109d8dfbc9fab24 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 26 Nov 2019 23:18:29 +0000 Subject: [PATCH 037/223] Bump version to: 0.9.3 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 3a854abfd..3999a3e09 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.2" + "version": "0.9.3" } diff --git a/packages/cli/package.json b/packages/cli/package.json index b2a686e85..870a52ee5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.2", + "version": "0.9.3", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.2", + "jimp": "^0.9.3", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index c490bfa59..5be05004e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.2", + "version": "0.9.3", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index b75b8d61d..11f55e787 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.2", + "version": "0.9.3", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 7a2d4bcf6..da08158c8 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.2", + "version": "0.9.3", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 42b940074..b657462e7 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.2", + "version": "0.9.3", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 18daa669f..c7c12b9e4 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.2", + "version": "0.9.3", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index ab1225cc3..33fe63a8d 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.2", + "version": "0.9.3", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index fa0570780..7b4c66e02 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.2", + "version": "0.9.3", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 955537c92..a8de4721a 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.2", + "version": "0.9.3", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 79e8584b4..baa3007cb 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.2", + "version": "0.9.3", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 7d31adc54..abeb692f7 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.2", + "version": "0.9.3", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index b61a18351..2faf2761b 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.2", + "version": "0.9.3", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index e102399b8..9e2086338 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.2", + "version": "0.9.3", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 5e832850d..d9292fd30 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.2", + "version": "0.9.3", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 7996ac076..806db92f9 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.2", + "version": "0.9.3", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 32e5386d6..14a174fbe 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.2", + "version": "0.9.3", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 3f4b0e607..869c68854 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.2", + "version": "0.9.3", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index f4d1421a1..eab414f62 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.2", + "version": "0.9.3", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 9041495e3..afe767095 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.2", + "version": "0.9.3", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 58f58f015..16111b032 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.2", + "version": "0.9.3", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 53c2bf467..458002b45 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.2", + "version": "0.9.3", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 4e68187c0..ca2c517fe 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.2", + "version": "0.9.3", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index d4e2fe013..ee4983b37 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.2", + "version": "0.9.3", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index b7c78d3e7..7d97e9261 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.2", + "version": "0.9.3", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index d67891800..75ec47ba2 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.2", + "version": "0.9.3", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index cd0d1bf7c..0acc845f8 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 0b467c80a..adfcbba08 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.2", + "version": "0.9.3", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 66291f45f..67b45b665 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index a62b9d9aa..e45287f08 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index e2d026850..3eb4e9d9e 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 90bd9db2c..a96c1eb1e 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index b4e88e2a0..9c7a1b2bb 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 394aa89cb..7252b7f0e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.2", + "version": "0.9.3", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index f3fef0428..d46bdee66 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.2", + "version": "0.9.3", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 02eb2bfae7c81eb96c14a6e6216a2cd7fb05ba5f Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 3 Mar 2020 23:31:14 +0100 Subject: [PATCH 038/223] Update plugin-shadow type definition. (#841) The source code supports blur, the type defintion did not. --- packages/plugin-shadow/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/plugin-shadow/index.d.ts b/packages/plugin-shadow/index.d.ts index c2611bf4b..75f6bae00 100644 --- a/packages/plugin-shadow/index.d.ts +++ b/packages/plugin-shadow/index.d.ts @@ -4,6 +4,7 @@ interface Shadow { shadow(options?: { size?: number, opacity?: number, + blur: number, x?: number, y?: number }, From a47607039f1159065cf06fd7e6e5835188741d9f Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 3 Mar 2020 22:40:36 +0000 Subject: [PATCH 039/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ packages/plugin-shadow/CHANGELOG.md | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ad8ed552..b68e11204 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.9.4 (Tue Mar 03 2020) + +#### 🐛 Bug Fix + +- `@jimp/plugin-shadow` + - Update plugin-shadow type definition. [#841](https://github.com/oliver-moran/jimp/pull/841) ([@lekoaf](https://github.com/lekoaf)) + +#### Authors: 1 + +- Martin ([@lekoaf](https://github.com/lekoaf)) + +--- + # v0.9.2 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-shadow/CHANGELOG.md b/packages/plugin-shadow/CHANGELOG.md index 36ecda1a0..0e3ef1f9a 100644 --- a/packages/plugin-shadow/CHANGELOG.md +++ b/packages/plugin-shadow/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.9.4 (Tue Mar 03 2020) + +#### 🐛 Bug Fix + +- `@jimp/plugin-shadow` + - Update plugin-shadow type definition. [#841](https://github.com/oliver-moran/jimp/pull/841) ([@lekoaf](https://github.com/lekoaf)) + +#### Authors: 1 + +- Martin ([@lekoaf](https://github.com/lekoaf)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From a1120faa4dbe2a3ab3a465b93e5db254ec2876f2 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 3 Mar 2020 22:40:37 +0000 Subject: [PATCH 040/223] Bump version to: 0.9.4 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 3999a3e09..458936873 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.3" + "version": "0.9.4" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 870a52ee5..c0efeab47 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.3", + "version": "0.9.4", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.3", + "jimp": "^0.9.4", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 5be05004e..0ecd82b2d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.3", + "version": "0.9.4", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 11f55e787..3e2ca92dd 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.3", + "version": "0.9.4", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index da08158c8..9a79df4d9 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.3", + "version": "0.9.4", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index b657462e7..b4e4e9d61 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.3", + "version": "0.9.4", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index c7c12b9e4..82354fe6b 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.3", + "version": "0.9.4", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 33fe63a8d..6278dd98a 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.3", + "version": "0.9.4", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 7b4c66e02..4c84c54bf 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.3", + "version": "0.9.4", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index a8de4721a..b8ddd6ef4 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.3", + "version": "0.9.4", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index baa3007cb..a2acdbf8e 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.3", + "version": "0.9.4", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index abeb692f7..08e161056 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.3", + "version": "0.9.4", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 2faf2761b..6765d8d4c 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.3", + "version": "0.9.4", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 9e2086338..e0e923b2b 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.3", + "version": "0.9.4", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index d9292fd30..f165e86e3 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.3", + "version": "0.9.4", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 806db92f9..dedd1ff66 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.3", + "version": "0.9.4", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 14a174fbe..d180414fe 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.3", + "version": "0.9.4", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 869c68854..fe9052fd3 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.3", + "version": "0.9.4", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index eab414f62..d19c1f2a4 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.3", + "version": "0.9.4", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index afe767095..ba4a30f5d 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.3", + "version": "0.9.4", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 16111b032..8c76e8c29 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.3", + "version": "0.9.4", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 458002b45..dcdf5b4a1 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.3", + "version": "0.9.4", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index ca2c517fe..53e938bd9 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.3", + "version": "0.9.4", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index ee4983b37..836768110 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.3", + "version": "0.9.4", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 7d97e9261..8aa601920 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.3", + "version": "0.9.4", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 75ec47ba2..41bdb7f5d 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.3", + "version": "0.9.4", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 0acc845f8..0a8748557 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index adfcbba08..c954aeeaa 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.3", + "version": "0.9.4", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 67b45b665..45a1954e7 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index e45287f08..ea651b6a2 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 3eb4e9d9e..fa509d28d 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index a96c1eb1e..86177fba1 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 9c7a1b2bb..adca4aeba 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 7252b7f0e..c433ff99d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.3", + "version": "0.9.4", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index d46bdee66..6bb039713 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.3", + "version": "0.9.4", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 01a565ff34d687729878acbf2aedea55f90ba2c5 Mon Sep 17 00:00:00 2001 From: Milos Bejda Date: Tue, 3 Mar 2020 17:51:00 -0500 Subject: [PATCH 041/223] Added ttf2fnt.com to the list (#845) Added ttf2fnt.com to the list --- packages/plugin-print/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/plugin-print/README.md b/packages/plugin-print/README.md index d7ea56876..2d5f9daf3 100644 --- a/packages/plugin-print/README.md +++ b/packages/plugin-print/README.md @@ -9,6 +9,9 @@ Jimp supports basic typography using BMFont format (.fnt) even ones in different Online tools are also available to convert TTF fonts to BMFont format. They can be used to create color font or sprite packs. + +:star: [ttf2fnt](https://ttf2fnt.com/) + :star: [Littera](http://kvazars.com/littera/) :star: [Hiero](https://github.com/libgdx/libgdx/wiki/Hiero) From 002d16b9f634d505df1f5b22de809d0b7b67fe2a Mon Sep 17 00:00:00 2001 From: Dominique Rau Date: Tue, 3 Mar 2020 23:51:38 +0100 Subject: [PATCH 042/223] Export font type (#838) --- packages/plugin-print/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/plugin-print/index.d.ts b/packages/plugin-print/index.d.ts index 1380b71f4..5d0273bbd 100644 --- a/packages/plugin-print/index.d.ts +++ b/packages/plugin-print/index.d.ts @@ -40,7 +40,7 @@ export interface FontCommon { blueChnl: number; } -interface Font { +export interface Font { chars: { [char: string]: FontChar; }; From b8102479362d36ba990ada439abadaeccb532b48 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 3 Mar 2020 22:58:59 +0000 Subject: [PATCH 043/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 18 ++++++++++++++++++ packages/plugin-print/CHANGELOG.md | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b68e11204..cf3f7df1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +# v0.9.5 (Tue Mar 03 2020) + +#### 🐛 Bug Fix + +- `@jimp/plugin-print` + - Export font type [#838](https://github.com/oliver-moran/jimp/pull/838) ([@DomiR](https://github.com/DomiR)) + +#### 📝 Documentation + +- `@jimp/plugin-print` + - Added ttf2fnt.com to the list [#845](https://github.com/oliver-moran/jimp/pull/845) ([@mbejda](https://github.com/mbejda)) + +#### Authors: 1 + +- Dominique Rau ([@DomiR](https://github.com/DomiR)) + +--- + # v0.9.4 (Tue Mar 03 2020) #### 🐛 Bug Fix diff --git a/packages/plugin-print/CHANGELOG.md b/packages/plugin-print/CHANGELOG.md index 36ecda1a0..ba469065f 100644 --- a/packages/plugin-print/CHANGELOG.md +++ b/packages/plugin-print/CHANGELOG.md @@ -1,3 +1,21 @@ +# v0.9.5 (Tue Mar 03 2020) + +#### 🐛 Bug Fix + +- `@jimp/plugin-print` + - Export font type [#838](https://github.com/oliver-moran/jimp/pull/838) ([@DomiR](https://github.com/DomiR)) + +#### 📝 Documentation + +- `@jimp/plugin-print` + - Added ttf2fnt.com to the list [#845](https://github.com/oliver-moran/jimp/pull/845) ([@mbejda](https://github.com/mbejda)) + +#### Authors: 1 + +- Dominique Rau ([@DomiR](https://github.com/DomiR)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From ecadad6b337ee78e23d683e9560a4182e43d9820 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 3 Mar 2020 22:59:00 +0000 Subject: [PATCH 044/223] Bump version to: 0.9.5 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 458936873..1a15fd41e 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.4" + "version": "0.9.5" } diff --git a/packages/cli/package.json b/packages/cli/package.json index c0efeab47..4cf207a8e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.4", + "version": "0.9.5", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.4", + "jimp": "^0.9.5", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 0ecd82b2d..1d163da02 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.4", + "version": "0.9.5", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 3e2ca92dd..30a687c21 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.4", + "version": "0.9.5", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 9a79df4d9..fcf6b2656 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.4", + "version": "0.9.5", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index b4e4e9d61..92827e0bd 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.4", + "version": "0.9.5", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 82354fe6b..35221ad28 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.4", + "version": "0.9.5", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 6278dd98a..18801925e 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.4", + "version": "0.9.5", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 4c84c54bf..293ca4ac4 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.4", + "version": "0.9.5", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index b8ddd6ef4..2ca998dc5 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.4", + "version": "0.9.5", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index a2acdbf8e..942f9849b 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.4", + "version": "0.9.5", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 08e161056..8100c7de3 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.4", + "version": "0.9.5", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 6765d8d4c..dbe7f9227 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.4", + "version": "0.9.5", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index e0e923b2b..2d6e25561 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.4", + "version": "0.9.5", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index f165e86e3..8cf6049b6 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.4", + "version": "0.9.5", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index dedd1ff66..4c242b4a3 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.4", + "version": "0.9.5", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index d180414fe..caedafb6a 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.4", + "version": "0.9.5", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index fe9052fd3..082ff09c5 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.4", + "version": "0.9.5", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index d19c1f2a4..9aa286552 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.4", + "version": "0.9.5", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index ba4a30f5d..f434fec17 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.4", + "version": "0.9.5", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 8c76e8c29..807cf62fa 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.4", + "version": "0.9.5", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index dcdf5b4a1..2a738f94c 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.4", + "version": "0.9.5", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 53e938bd9..83cec03ce 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.4", + "version": "0.9.5", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 836768110..24997e694 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.4", + "version": "0.9.5", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 8aa601920..086dad579 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.4", + "version": "0.9.5", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 41bdb7f5d..6bd057738 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.4", + "version": "0.9.5", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 0a8748557..74dc154eb 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index c954aeeaa..e82c62837 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.4", + "version": "0.9.5", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 45a1954e7..bde33ec22 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index ea651b6a2..e6dc2429f 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index fa509d28d..637474256 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 86177fba1..a506dea4d 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index adca4aeba..496e12993 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index c433ff99d..c5a4ca83d 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.4", + "version": "0.9.5", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 6bb039713..a127e3988 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.4", + "version": "0.9.5", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 8eb2e9b8dbb2f1cf7c4a4d0da5d2a3436eb83543 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Wed, 18 Mar 2020 09:50:14 -0700 Subject: [PATCH 045/223] Fix TypeScript error on 'next' (#858) * Fix TypeScript error on 'next' * Further work to fix type tests --- packages/core/types/jimp.d.ts | 15 ++++++++++----- packages/core/types/utils.d.ts | 4 ++-- packages/custom/types/test.ts | 18 ++++++++++++++++++ packages/jimp/types/index.d.ts | 13 +++++++++---- packages/jimp/types/test.ts | 13 +++++++++++++ 5 files changed, 52 insertions(+), 11 deletions(-) diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts index b496adce2..97fdce791 100644 --- a/packages/core/types/jimp.d.ts +++ b/packages/core/types/jimp.d.ts @@ -170,14 +170,19 @@ export interface Jimp extends JimpConstructors { ): this; // Functions - appendConstructorOption( + /** + * I'd like to make `Args` generic and used in `run` and `test` but alas, + * it's not possible RN: + * https://github.com/microsoft/TypeScript/issues/26113 + */ + appendConstructorOption( name: string, - test: (...args: T[]) => boolean, + test: (...args: any[]) => boolean, run: ( - this: this, - resolve: (jimp: this) => any, + this: J, + resolve: (jimp?: J) => any, reject: (reason: Error) => any, - ...args: T[] + ...args: any[] ) => any ): void; read(path: string, cb?: ImageCallback): Promise; diff --git a/packages/core/types/utils.d.ts b/packages/core/types/utils.d.ts index 7a733d79c..72d63a555 100644 --- a/packages/core/types/utils.d.ts +++ b/packages/core/types/utils.d.ts @@ -13,8 +13,8 @@ export type UnionToIntersection = * Left loose as "any" in order to enable the GetPluginValue to work properly */ export type WellFormedValues = - T['class'] & - T['constants']; + (T extends {class: any} ? T['class'] : {}) & + (T extends {constants: any} ? T['constants'] : {}); // Util type for the functions that deal with `@jimp/custom` // Must accept any or no props thanks to typing of the `plugins` intersected function diff --git a/packages/custom/types/test.ts b/packages/custom/types/test.ts index 82f83fe3f..8b4ce6d65 100644 --- a/packages/custom/types/test.ts +++ b/packages/custom/types/test.ts @@ -6,6 +6,7 @@ import resize from '@jimp/plugin-resize'; import scale from '@jimp/plugin-scale'; import types from '@jimp/types'; import plugins from '@jimp/plugins'; +import * as Jimp from 'jimp'; // configure should return a valid Jimp type with addons const CustomJimp = configure({ @@ -350,3 +351,20 @@ test('can handle only one plugin', () => { // $ExpectError Jiimp.func(); }); + + +test('Can handle appendConstructorOption', () => { + const AppendJimp = configure({}); + + AppendJimp.appendConstructorOption( + 'Name of Option', + args => args.hasSomeCustomThing, + function(resolve, reject, args) { + // $ExpectError + this.bitmap = 3; + // $ExpectError + AppendJimp.resize(2, 2); + resolve(); + } + ); +}); diff --git a/packages/jimp/types/index.d.ts b/packages/jimp/types/index.d.ts index d8881787f..88687bdf4 100644 --- a/packages/jimp/types/index.d.ts +++ b/packages/jimp/types/index.d.ts @@ -341,14 +341,19 @@ interface DepreciatedJimp { mask(src: this, x: number, y: number, cb?: ImageCallback): this; // Functions - appendConstructorOption( + /** + * I'd like to make `Args` generic and used in `run` and `test` but alas, + * it's not possible RN: + * https://github.com/microsoft/TypeScript/issues/26113 + */ + appendConstructorOption( name: string, - test: (...args: T[]) => boolean, + test: (...args: any[]) => boolean, run: ( this: this, - resolve: (jimp: this) => any, + resolve: (jimp?: this) => any, reject: (reason: Error) => any, - ...args: T[] + ...args: any[] ) => any ): void; read(path: string, cb?: ImageCallback): Promise; diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts index 13a257150..863484047 100644 --- a/packages/jimp/types/test.ts +++ b/packages/jimp/types/test.ts @@ -86,3 +86,16 @@ test('Can handle callback with constructor', () => { cbJimpInst.func(); }); }) + +test('Can handle appendConstructorOption', () => { + Jimp.appendConstructorOption( + 'Name of Option', + args => args.hasSomeCustomThing, + function(resolve, reject, args) { + // $ExpectError + this.bitmap = 3; + Jimp.resize(2, 2); + resolve(); + } + ); +}); From 8e8e3527c597d4131771882748d3c966a20a467b Mon Sep 17 00:00:00 2001 From: Denis Bendrikov Date: Wed, 18 Mar 2020 19:39:48 +0200 Subject: [PATCH 046/223] Relax mkdirp dependency to allow newer minimist (#857) Fixing https://www.npmjs.com/advisories/1179 by relaxing mkdirp versions range to allow 0.5.2 or 0.5.3 which contains a fix as per https://github.com/isaacs/node-mkdirp/issues/7#issuecomment-600231795 --- packages/core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/package.json b/packages/core/package.json index 1d163da02..2f8c849cb 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,7 +42,7 @@ "exif-parser": "^0.1.12", "file-type": "^9.0.0", "load-bmfont": "^1.3.1", - "mkdirp": "0.5.1", + "mkdirp": "^0.5.1", "phin": "^2.9.1", "pixelmatch": "^4.0.2", "tinycolor2": "^1.4.1" From cd5cbca9afbec3158265824642eeba580cddcef9 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Wed, 18 Mar 2020 11:00:41 -0700 Subject: [PATCH 047/223] upgrade auto (#860) * upgrade auto * update CI to use node 10 --- .circleci/config.yml | 2 +- package.json | 2 +- packages/jimp/package.json | 1 - yarn.lock | 574 ++++++++++++++++++++++--------------- 4 files changed, 342 insertions(+), 237 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f8c38ef5..e50397782 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 defaults: &defaults working_directory: ~/jimp docker: - - image: circleci/node:8.14-browsers + - image: circleci/node:10-browsers jobs: install: diff --git a/package.json b/package.json index 5a64b0d6a..db3afd0c0 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@babel/preset-env": "^7.7.1", "@babel/register": "^7.7.0", "@babel/runtime": "^7.7.2", - "auto": "^7.16.3", + "auto": "^9.19.5", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-istanbul": "^5.2.0", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index fcf6b2656..8f038fb76 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -74,7 +74,6 @@ "@babel/preset-env": "^7.7.1", "@babel/register": "^7.7.0", "@jimp/test-utils": "link:../test-utils", - "auto": "^7.6.0", "babel-eslint": "^10.0.3", "babel-plugin-add-module-exports": "^1.0.2", "babel-plugin-istanbul": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index 8f3e12fb7..9cdf3717c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,119 +2,80 @@ # yarn lockfile v1 -"@atomist/slack-messages@~1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@atomist/slack-messages/-/slack-messages-1.1.1.tgz#9de42932e89065fb4fe4842978ca2d1ed3424cea" - integrity sha512-m2OzlTDbhvzK4hgswH9Lx0cdpq1AntXu53Klz5RGkFfuoDvKsnlU7tmtVfNWtUiP0zZbGtrb/BZYH7aB6TRnMA== - -"@auto-it/core@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-7.16.3.tgz#4e2926501793ee65166e2f735bc802210da43a43" - integrity sha512-D4T3PfFb/A8I0VoTAxzS3zmIv1IGH3g2sD3EZSC5Fw2QEnWBCflRnuQ7mgnVDN7qc8/ykt7qPrk7LiCmJnY8Lg== - dependencies: - "@octokit/graphql" "^4.0.0" - "@octokit/plugin-enterprise-compatibility" "1.1.1" - "@octokit/plugin-retry" "^2.2.0" - "@octokit/plugin-throttling" "^2.6.0" - "@octokit/rest" "16.35.0" +"@auto-it/bot-list@^9.19.5": + version "9.19.5" + resolved "https://registry.yarnpkg.com/@auto-it/bot-list/-/bot-list-9.19.5.tgz#9c6bb815ae108cfb586bda3c749584e4aa3ca42e" + integrity sha512-MMz+5B2TrY560P8C3jIIEWZSQBL+4xPNaZOIHyv4PAPiMFze602xYKgkmoz9A0oTrzPqhXRHfX5Sxys/MgkT6Q== + +"@auto-it/core@^9.19.5": + version "9.19.5" + resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-9.19.5.tgz#1b53c122c65505a13fb4319ca395e8a402ab64a4" + integrity sha512-VH3heUWA8KzkV/ezNKQfDSxnBpo0XfJ+0niuWLWJ0NBpcZvq+5qDiamHeFOmOo7+3v4FosvPzvbo6EtdJaiGTg== + dependencies: + "@auto-it/bot-list" "^9.19.5" + "@octokit/core" "2.4.2" + "@octokit/graphql" "4.3.1" + "@octokit/plugin-enterprise-compatibility" "1.2.1" + "@octokit/plugin-retry" "3.0.1" + "@octokit/plugin-throttling" "^3.2.0" + "@octokit/rest" "16.43.1" await-to-js "^2.1.1" + chalk "^3.0.0" cosmiconfig "6.0.0" - dedent "^0.7.0" - deepmerge "^4.0.0" - dotenv "^8.0.0" - enquirer "^2.3.0" - env-ci "^4.1.1" - gitlog "^3.1.2" - https-proxy-agent "^3.0.0" - import-cwd "^3.0.0" - lodash.chunk "^4.2.0" - node-fetch "2.6.0" - semver "^6.0.0" - signale "^1.4.0" - tapable "^2.0.0-beta.2" - tinycolor2 "^1.4.1" - tslib "1.10.0" - typescript-memoize "^1.0.0-alpha.3" - url-join "^4.0.0" - -"@auto-it/core@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@auto-it/core/-/core-7.6.0.tgz#5b155e5f09ba2e8a190a7569419a3e9ca7165415" - integrity sha512-mhkjcY41w1Jpi5HgdpDWBRbGOC2Jp4yqWRecdiT3LRP7/WTmoKyvEHU7n4goQ2cYjLyBTui0Zss5WjfsqNhxgA== - dependencies: - "@atomist/slack-messages" "~1.1.0" - "@octokit/graphql" "^4.0.0" - "@octokit/plugin-enterprise-compatibility" "^1.1.1" - "@octokit/plugin-retry" "^2.2.0" - "@octokit/plugin-throttling" "^2.6.0" - "@octokit/rest" "16.28.7" - await-to-js "^2.1.1" - cosmiconfig "5.2.1" - dedent "^0.7.0" deepmerge "^4.0.0" dotenv "^8.0.0" - enquirer "^2.3.0" - env-ci "^4.1.1" - gitlog "^3.1.2" + endent "^1.3.0" + enquirer "^2.3.4" + env-ci "^5.0.1" + fp-ts "^2.5.3" + fromentries "^1.2.0" + gitlogplus "^3.1.2" + https-proxy-agent "^5.0.0" import-cwd "^3.0.0" + import-from "^3.0.0" + io-ts "^2.1.2" lodash.chunk "^4.2.0" + log-symbols "^3.0.0" node-fetch "2.6.0" - semver "^6.0.0" + parse-github-url "1.0.2" + semver "^7.0.0" signale "^1.4.0" tapable "^2.0.0-beta.2" + terminal-link "^2.1.1" tinycolor2 "^1.4.1" + tslib "1.11.1" typescript-memoize "^1.0.0-alpha.3" url-join "^4.0.0" -"@auto-it/npm@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-7.16.3.tgz#313f18701150f84dc5b19b3bcbd0c413edcb0a87" - integrity sha512-fr3NL4rCH3XvwXiwXFbRPcf2auJXNS6uAjl9ALr1igC/cTCzuX4tZk7XIjQ3vdguJmD+F9+VfmHFOsUoPMB56A== - dependencies: - "@auto-it/core" "^7.16.3" - env-ci "^4.1.1" - get-monorepo-packages "^1.1.0" - parse-author "^2.0.0" - parse-github-url "1.0.2" - registry-url "^5.1.0" - semver "^6.0.0" - tslib "1.10.0" - typescript-memoize "^1.0.0-alpha.3" - url-join "^4.0.0" - user-home "^2.0.0" - -"@auto-it/npm@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-7.6.0.tgz#8f8cde72427e76885a626f3a07fc166a11ca57e1" - integrity sha512-XuYEti3DuZRHzZmnPt8y74QdW6VRpqw7bNoVY+J87EzqjUmIRaqNeY0hLuCZ2vKjDtk/bRUgENxLlA4mcst0mQ== +"@auto-it/npm@^9.19.5": + version "9.19.5" + resolved "https://registry.yarnpkg.com/@auto-it/npm/-/npm-9.19.5.tgz#67f93cc02cf4e86097222c27014d2612330ad206" + integrity sha512-LZE7hMkKRkTGFHTw+Pps+kwPLmcOyHuZ/UCHPu7G2y52vX0J9X+VhpEmu3eWIdz4ismq+N7muk5hYkclus0z1A== dependencies: - "@auto-it/core" "^7.6.0" - env-ci "^4.1.1" + "@auto-it/core" "^9.19.5" + env-ci "^5.0.1" + fp-ts "^2.5.3" get-monorepo-packages "^1.1.0" + io-ts "^2.1.2" parse-author "^2.0.0" parse-github-url "1.0.2" registry-url "^5.1.0" - semver "^6.0.0" + semver "^7.0.0" + tslib "1.11.1" typescript-memoize "^1.0.0-alpha.3" url-join "^4.0.0" user-home "^2.0.0" -"@auto-it/released@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-7.16.3.tgz#35acef5d78dad875c6e0eac9cc94cabff6511aa2" - integrity sha512-yDdaCYaTGvvnAM7yfHd6LR/vm9Iad2IxIGceNBP7wohDBjmwXqIbHeZASr8lSVpjoo1r3gUOZgUJfynItgS+dg== +"@auto-it/released@^9.19.5": + version "9.19.5" + resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-9.19.5.tgz#e207e885ebd6208c0464e77b496ac8d730809700" + integrity sha512-gVfFVB2XayJdfxIRngp+BbZnJTSGwRZXS/wsw2S04Q3XzCHef/WqR1p8ux/dIQobOyQ4FYlELgrTtuYXHoqhnQ== dependencies: - "@auto-it/core" "^7.16.3" - deepmerge "^4.0.0" - tslib "1.10.0" - -"@auto-it/released@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@auto-it/released/-/released-7.6.0.tgz#8a2db26691a7294ad887ec492c094c5d3e69f6fd" - integrity sha512-iLdd1XC7ZUyHRoKVqes7Ym6EXMrYKND8Dz/Btjufye+sYpkYJUj1Thahj4dT5BiWXkgH+ffu0qMJ2R7c7OuJXg== - dependencies: - "@auto-it/core" "^7.6.0" + "@auto-it/core" "^9.19.5" deepmerge "^4.0.0" + fp-ts "^2.5.3" + io-ts "^2.1.2" + tslib "1.11.1" "@babel/cli@^7.7.0": version "7.7.0" @@ -1047,7 +1008,7 @@ which "^1.3.1" "@jimp/bmp@link:packages/type-bmp": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1055,7 +1016,7 @@ core-js "^3.4.1" "@jimp/core@link:packages/core": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1065,20 +1026,20 @@ exif-parser "^0.1.12" file-type "^9.0.0" load-bmfont "^1.3.1" - mkdirp "0.5.1" + mkdirp "^0.5.1" phin "^2.9.1" pixelmatch "^4.0.2" tinycolor2 "^1.4.1" "@jimp/custom@link:packages/custom": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/core" "link:packages/core" core-js "^3.4.1" "@jimp/gif@link:packages/type-gif": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1086,7 +1047,7 @@ omggif "^1.0.9" "@jimp/jpeg@link:packages/type-jpeg": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1094,21 +1055,21 @@ jpeg-js "^0.3.4" "@jimp/plugin-blit@link:packages/plugin-blit": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-blur@link:packages/plugin-blur": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-color@link:packages/plugin-color": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1116,77 +1077,77 @@ tinycolor2 "^1.4.1" "@jimp/plugin-contain@link:packages/plugin-contain": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-cover@link:packages/plugin-cover": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-crop@link:packages/plugin-crop": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-displace@link:packages/plugin-displace": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-dither@link:packages/plugin-dither": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-flip@link:packages/plugin-flip": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-gaussian@link:packages/plugin-gaussian": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-invert@link:packages/plugin-invert": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-mask@link:packages/plugin-mask": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-normalize@link:packages/plugin-normalize": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-print@link:packages/plugin-print": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1194,28 +1155,28 @@ load-bmfont "^1.4.0" "@jimp/plugin-resize@link:packages/plugin-resize": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-rotate@link:packages/plugin-rotate": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-scale@link:packages/plugin-scale": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugins@link:packages/plugins": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/plugin-blit" "link:packages/plugin-blit" @@ -1239,7 +1200,7 @@ timm "^1.6.1" "@jimp/png@link:packages/type-png": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1247,21 +1208,21 @@ pngjs "^3.3.3" "@jimp/test-utils@link:packages/test-utils": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" pngjs "^3.3.3" "@jimp/tiff@link:packages/type-tiff": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" utif "^2.0.1" "@jimp/types@link:packages/types": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" "@jimp/bmp" "link:packages/type-bmp" @@ -1273,7 +1234,7 @@ timm "^1.6.1" "@jimp/utils@link:packages/utils": - version "0.9.2" + version "0.9.5" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" @@ -1990,6 +1951,25 @@ "@nodelib/fs.scandir" "2.1.2" fastq "^1.6.0" +"@octokit/auth-token@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.0.tgz#b64178975218b99e4dfe948253f0673cbbb59d9f" + integrity sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg== + dependencies: + "@octokit/types" "^2.0.0" + +"@octokit/core@2.4.2": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-2.4.2.tgz#c22e583afc97e74015ea5bfd3ffb3ffc56c186ed" + integrity sha512-fUx/Qt774cgiPhb3HRKfdl6iufVL/ltECkwkCg373I4lIPYvAPY4cbidVZqyVqHI+ThAIlFlTW8FT4QHChv3Sg== + dependencies: + "@octokit/auth-token" "^2.4.0" + "@octokit/graphql" "^4.3.1" + "@octokit/request" "^5.3.1" + "@octokit/types" "^2.0.0" + before-after-hook "^2.1.0" + universal-user-agent "^5.0.0" + "@octokit/endpoint@^5.1.0": version "5.3.5" resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.3.5.tgz#2822c3b01107806dbdce3863b6205e3eff4289ed" @@ -2007,36 +1987,62 @@ is-plain-object "^3.0.0" universal-user-agent "^4.0.0" -"@octokit/graphql@^4.0.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.2.0.tgz#99e739f3cba12ab83136a8a82fffdbfa0715ed28" - integrity sha512-6JKVE2cJPZVIM1LLsy7M4rKcaE3r6dbP7o895FLEpClHeMDv1a+k3yANue0ycMhM1Es9/WEy8hjBaBpOBETw6A== +"@octokit/graphql@4.3.1", "@octokit/graphql@^4.3.1": + version "4.3.1" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.3.1.tgz#9ee840e04ed2906c7d6763807632de84cdecf418" + integrity sha512-hCdTjfvrK+ilU2keAdqNBWOk+gm1kai1ZcdjRfB30oA3/T6n53UVJb7w0L5cR3/rhU91xT3HSqCd+qbvH06yxA== dependencies: - "@octokit/request" "^5.0.0" + "@octokit/request" "^5.3.0" + "@octokit/types" "^2.0.0" universal-user-agent "^4.0.0" -"@octokit/plugin-enterprise-compatibility@1.1.1", "@octokit/plugin-enterprise-compatibility@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-compatibility/-/plugin-enterprise-compatibility-1.1.1.tgz#1d4189d588eccb1bbc23cd72278129491cfba5d2" - integrity sha512-/o09y5I1JJMGGTU2y//QXBKjILX0BaDgBK27NRBJPRxD4BsDVzIsRFQm7ejPWW3l2xOao8tvN7Yh73D5cXBBbg== +"@octokit/plugin-enterprise-compatibility@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-compatibility/-/plugin-enterprise-compatibility-1.2.1.tgz#ea8fa7fd4b04fac2289bac1d63791c77a23a74fb" + integrity sha512-c77pFG3CyxhQbu2B80TI/GVA0ex9krEAyBbdMGn8h8EtZoldK+4Bru2ecdFKfy5xi8RlmzIXIeTwi6wApd5/VQ== + dependencies: + "@octokit/request-error" "^1.2.0" + "@octokit/types" "^2.0.1" "@octokit/plugin-enterprise-rest@^3.6.1": version "3.6.2" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561" integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA== -"@octokit/plugin-retry@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-retry/-/plugin-retry-2.2.0.tgz#11f3957a46ccdb7b7f33caabf8c17e57b25b80b2" - integrity sha512-x5Kd8Lke+a4hTDCe5akZxpGmVwu1eeVt2FJX0jeo3CxHGbfHbXb4zhN5quKfGL9oBLV/EdHQIJ6zwIMjuzxOlw== +"@octokit/plugin-paginate-rest@^1.1.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz#004170acf8c2be535aba26727867d692f7b488fc" + integrity sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q== + dependencies: + "@octokit/types" "^2.0.1" + +"@octokit/plugin-request-log@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e" + integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw== + +"@octokit/plugin-rest-endpoint-methods@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz#3288ecf5481f68c494dd0602fc15407a59faf61e" + integrity sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ== dependencies: + "@octokit/types" "^2.0.1" + deprecation "^2.3.1" + +"@octokit/plugin-retry@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-retry/-/plugin-retry-3.0.1.tgz#4f17e4349b89754fd06951b548f08e2d8e7dd311" + integrity sha512-X+VALkeYyE4XGMHOoOnRS1/OvwvleZ2Xe3yxshaAKJrA4pbjBYptDx7IAY9xQj5JYY9vlCKUsXEZMWLRNxfViw== + dependencies: + "@octokit/types" "^2.0.1" bottleneck "^2.15.3" -"@octokit/plugin-throttling@^2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-throttling/-/plugin-throttling-2.6.0.tgz#0b3107c2267e3a8cf6f63925847ec3ebe9e0aa8d" - integrity sha512-E0xQrcD36sVEeBhut6j9nWX38vm/1LKMRSUqjvJ/mqGLXfHr4jYMsrR3I/nT2QC0eJL1/SKMt7zxOt7pZiFhDA== +"@octokit/plugin-throttling@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-throttling/-/plugin-throttling-3.2.0.tgz#e900bb4e5976ea45ccb2c32c068d09c28fed31ef" + integrity sha512-4tyTbRFu7OTJFssdj6j74PdvJ8LqMVBFYeRd4+jBJm68LbqmgHunujwvyfjHGp2L+HwC69/BT36PKRWF131Vdg== dependencies: + "@octokit/types" "^2.0.1" bottleneck "^2.15.3" "@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2": @@ -2047,6 +2053,15 @@ deprecation "^2.0.0" once "^1.4.0" +"@octokit/request-error@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.2.1.tgz#ede0714c773f32347576c25649dc013ae6b31801" + integrity sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA== + dependencies: + "@octokit/types" "^2.0.0" + deprecation "^2.0.0" + once "^1.4.0" + "@octokit/request@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.1.0.tgz#5609dcc7b5323e529f29d535214383d9eaf0c05c" @@ -2074,30 +2089,29 @@ once "^1.4.0" universal-user-agent "^4.0.0" -"@octokit/rest@16.28.7": - version "16.28.7" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.28.7.tgz#a2c2db5b318da84144beba82d19c1a9dbdb1a1fa" - integrity sha512-cznFSLEhh22XD3XeqJw51OLSfyL2fcFKUO+v2Ep9MTAFfFLS1cK1Zwd1yEgQJmJoDnj4/vv3+fGGZweG+xsbIA== +"@octokit/request@^5.3.0", "@octokit/request@^5.3.1": + version "5.3.2" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.3.2.tgz#1ca8b90a407772a1ee1ab758e7e0aced213b9883" + integrity sha512-7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g== dependencies: - "@octokit/request" "^5.0.0" - "@octokit/request-error" "^1.0.2" - atob-lite "^2.0.0" - before-after-hook "^2.0.0" - btoa-lite "^1.0.0" + "@octokit/endpoint" "^5.5.0" + "@octokit/request-error" "^1.0.1" + "@octokit/types" "^2.0.0" deprecation "^2.0.0" - lodash.get "^4.4.2" - lodash.set "^4.3.2" - lodash.uniq "^4.5.0" - octokit-pagination-methods "^1.1.0" + is-plain-object "^3.0.0" + node-fetch "^2.3.0" once "^1.4.0" - universal-user-agent "^3.0.0" - url-template "^2.0.8" + universal-user-agent "^5.0.0" -"@octokit/rest@16.35.0": - version "16.35.0" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.35.0.tgz#7ccc1f802f407d5b8eb21768c6deca44e7b4c0d8" - integrity sha512-9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w== +"@octokit/rest@16.43.1": + version "16.43.1" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b" + integrity sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw== dependencies: + "@octokit/auth-token" "^2.4.0" + "@octokit/plugin-paginate-rest" "^1.1.1" + "@octokit/plugin-request-log" "^1.0.0" + "@octokit/plugin-rest-endpoint-methods" "2.4.0" "@octokit/request" "^5.2.0" "@octokit/request-error" "^1.0.2" atob-lite "^2.0.0" @@ -2136,6 +2150,13 @@ dependencies: "@types/node" ">= 8" +"@octokit/types@^2.0.1": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.5.0.tgz#f1bbd147e662ae2c79717d518aac686e58257773" + integrity sha512-KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww== + dependencies: + "@types/node" ">= 8" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -2288,6 +2309,13 @@ agent-base@4, agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" +agent-base@6: + version "6.0.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a" + integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw== + dependencies: + debug "4" + agent-base@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" @@ -2342,6 +2370,13 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-escapes@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + dependencies: + type-fest "^0.11.0" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -2615,33 +2650,22 @@ author-regex@^1.0.0: resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450" integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA= -auto@^7.16.3: - version "7.16.3" - resolved "https://registry.yarnpkg.com/auto/-/auto-7.16.3.tgz#440b51612bc4b657518b7dce2e398b3f91a040a3" - integrity sha512-654GEfLyGVMVMvS/A13fPAsIvFi1dFiT/s2rDbZGJnzxzHhuEk+ZFURR/GD+ARzSlbPIWB4bd25zg/pzpRLg6g== +auto@^9.19.5: + version "9.19.5" + resolved "https://registry.yarnpkg.com/auto/-/auto-9.19.5.tgz#c99ad15bf462a183c796bea59e216f97f76d13fa" + integrity sha512-AmiP1bKsNM1lq/VBCKLKiEYNVFp8GyiYo7On2OQUICOrYZcZVSYBsFbNw59KwwSzHu4jBoKuaGsaGXFncOZXng== dependencies: - "@auto-it/core" "^7.16.3" - "@auto-it/npm" "^7.16.3" - "@auto-it/released" "^7.16.3" + "@auto-it/core" "^9.19.5" + "@auto-it/npm" "^9.19.5" + "@auto-it/released" "^9.19.5" + await-to-js "^2.1.1" chalk "^3.0.0" command-line-application "^0.9.3" - dedent "^0.7.0" - signale "^1.4.0" - tslib "1.10.0" - -auto@^7.6.0: - version "7.6.0" - resolved "https://registry.yarnpkg.com/auto/-/auto-7.6.0.tgz#bb9178e38057e53047cfd0bc0ae2611afe2a09a1" - integrity sha512-nFSl3sPUKob5o/5M3gs/jP+PiYfedwlQPnP77opeQInVKeRNhDSdogXq2hLtl3lbkEwxAcQ2vgikfyJJnQ1IBQ== - dependencies: - "@auto-it/core" "^7.6.0" - "@auto-it/npm" "^7.6.0" - "@auto-it/released" "^7.6.0" - chalk "^2.4.2" - command-line-args "^5.1.1" - command-line-usage "^6.0.2" - dedent "^0.7.0" + endent "^1.3.0" + module-alias "^2.2.2" signale "^1.4.0" + terminal-link "^2.1.1" + tslib "1.11.1" await-to-js@^2.1.1: version "2.1.1" @@ -2763,7 +2787,7 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -before-after-hook@^2.0.0: +before-after-hook@^2.0.0, before-after-hook@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635" integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A== @@ -3535,16 +3559,6 @@ command-line-usage@^6.0.0: table-layout "^1.0.0" typical "^5.2.0" -command-line-usage@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.0.2.tgz#b130e3495ae743ce4833e1c9373bbb0898275dda" - integrity sha512-Jr9RQM43qWDwpRJOa0lgZw0LhiU8tgOqoR+xxIcb3eT5vFZi69fBWUODMSBtGUYI1qTlElPl3txFQY6rChVuXQ== - dependencies: - array-back "^3.1.0" - chalk "^2.4.2" - table-layout "^1.0.0" - typical "^5.1.0" - commander@^2.12.1, commander@^2.20.0, commander@^2.8.1, commander@~2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" @@ -3847,16 +3861,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@5.2.1, cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" - cosmiconfig@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -3868,6 +3872,16 @@ cosmiconfig@6.0.0: path-type "^4.0.0" yaml "^1.7.2" +cosmiconfig@^5.1.0, cosmiconfig@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + cp-file@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" @@ -4060,7 +4074,7 @@ debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -4217,7 +4231,7 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -deprecation@^2.0.0: +deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== @@ -4474,6 +4488,15 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" +endent@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/endent/-/endent-1.4.1.tgz#c58cc13dfc432d0b2c7faf74c13ffdca60b2d1c8" + integrity sha512-buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ== + dependencies: + dedent "^0.7.0" + fast-json-parse "^1.0.3" + objectorarray "^1.0.4" + engine.io-client@~3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36" @@ -4521,10 +4544,10 @@ enhance-visitors@^1.0.0: dependencies: lodash "^4.13.1" -enquirer@^2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.2.tgz#1c30284907cadff5ed2404bd8396036dd3da070e" - integrity sha512-PLhTMPUXlnaIv9D3Cq3/Zr1xb7soeDDgunobyCmYLUG19n24dvC8i+ZZgm2DekGpDnx7JvFSHV7lxfM58PMtbA== +enquirer@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.4.tgz#c608f2e1134c7f68c1c9ee056de13f9b31076de9" + integrity sha512-pkYrrDZumL2VS6VBGDhqbajCM2xpkUNLuKfGPjfKaSIBKYopQbqEFyrOkRMIb2HDR/rO1kGhEt/5twBwtzKBXw== dependencies: ansi-colors "^3.2.1" @@ -4533,12 +4556,12 @@ ent@~2.2.0: resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= -env-ci@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-4.1.1.tgz#b8438fc7258a0dc7a4f4c4816de730767946a718" - integrity sha512-eTgpkALDeYRGNhYM2fO9LKsWDifoUgKL7hxpPZqFMP2IU7f+r89DtKqCmk3yQB/jxS8CmZTfKnWO5TiIDFs9Hw== +env-ci@^5.0.1: + version "5.0.2" + resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-5.0.2.tgz#48b6687f8af8cdf5e31b8fcf2987553d085249d9" + integrity sha512-Xc41mKvjouTXD3Oy9AqySz1IeyvJvHZ20Twf5ZLYbNpPPIuCnL/qHCmNlD01LoNy0JTunw9HPYVptD19Ac7Mbw== dependencies: - execa "^1.0.0" + execa "^4.0.0" java-properties "^1.0.0" env-editor@^0.3.1: @@ -5056,6 +5079,21 @@ execa@^2.0.3: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.0.tgz#7f37d6ec17f09e6b8fc53288611695b6d12b9daf" + integrity sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + exif-parser@^0.1.12: version "0.1.12" resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922" @@ -5196,6 +5234,11 @@ fast-glob@^3.0.3: merge2 "^1.2.3" micromatch "^4.0.2" +fast-json-parse@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d" + integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw== + fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" @@ -5394,6 +5437,11 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +fp-ts@^2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/fp-ts/-/fp-ts-2.5.3.tgz#7f09cc7f3e09623c6ade303d98a2cccdb2cc861f" + integrity sha512-lQd+hahLd8cygNoXbEHDjH/cbF6XVWlEPb8h5GXXlozjCSDxWgclvkpOoTRfBA0P+r69l9VvW1nEsSGIJRQpWw== + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -5414,6 +5462,11 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fromentries@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fromentries/-/fromentries-1.2.0.tgz#e6aa06f240d6267f913cea422075ef88b63e7897" + integrity sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ== + fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" @@ -5654,10 +5707,10 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -gitlog@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/gitlog/-/gitlog-3.1.2.tgz#169105f05ca174155bf42fb8a870bbf5251455c5" - integrity sha512-e1g4ZuCWhyzzEzPnM5AJtGP4PLgN3NG8bE7mhPB6jkhvHlVQb0Wnue9e3+sV7J2+0V5RMsirvISFdwO0SIa0tA== +gitlogplus@^3.1.2: + version "3.1.7" + resolved "https://registry.yarnpkg.com/gitlogplus/-/gitlogplus-3.1.7.tgz#6838390bb21cbdec905a6ac992e421df3220514e" + integrity sha512-EqzJcTt04NEXzqAJTehDt4DKjfyuaEPGZhZL2ZRsdRNFHvRp4bqzMraqv0FgohprElBZTW1RNI41Ee4yWCjbKw== dependencies: debug "^3.1.0" lodash.assign "^4.2.0" @@ -6026,13 +6079,18 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" -https-proxy-agent@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz#b8c286433e87602311b01c8ea34413d856a4af81" - integrity sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg== +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== dependencies: - agent-base "^4.3.0" - debug "^3.1.0" + agent-base "6" + debug "4" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== humanize-ms@^1.2.1: version "1.2.1" @@ -6281,6 +6339,11 @@ invert-kv@^2.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== +io-ts@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/io-ts/-/io-ts-2.1.2.tgz#8ea4439c902c3d15cda343900bed7ee5a9977f42" + integrity sha512-whVRGaNBZSrkPrg1y+sSy/kv/fDjweQPP1UCLhKwJUHWGD6rFgbZ44FBF98JlY/FFzTA0MkhGeHWZ/aFhF42eA== + ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" @@ -7779,6 +7842,11 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== +module-alias@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.2.tgz#151cdcecc24e25739ff0aa6e51e1c5716974c0e0" + integrity sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q== + module-deps@^6.0.0: version "6.2.1" resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.1.tgz#cfe558784060e926824f474b4e647287837cda50" @@ -8096,6 +8164,13 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" +npm-run-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -8223,6 +8298,11 @@ object.values@^1.1.0: function-bind "^1.1.1" has "^1.0.3" +objectorarray@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483" + integrity sha512-91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w== + octokit-pagination-methods@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" @@ -8329,7 +8409,7 @@ os-locale@^3.0.0, os-locale@^3.1.0: lcid "^2.0.0" mem "^4.0.0" -os-name@^3.0.0, os-name@^3.1.0: +os-name@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== @@ -9633,6 +9713,11 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.0.0: + version "7.1.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" + integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -10311,7 +10396,7 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== @@ -10326,6 +10411,14 @@ supports-hyperlinks@^1.0.1: has-flag "^2.0.0" supports-color "^5.0.0" +supports-hyperlinks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" + integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + symbol-observable@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -10400,6 +10493,14 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" +terminal-link@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + test-exclude@^5.2.3: version "5.2.3" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0" @@ -10600,6 +10701,11 @@ tslib@1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== +tslib@1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" + integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== + tslint@5.14.0: version "5.14.0" resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.14.0.tgz#be62637135ac244fc9b37ed6ea5252c9eba1616e" @@ -10650,6 +10756,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -10695,7 +10806,7 @@ typical@^4.0.0: resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== -typical@^5.0.0, typical@^5.1.0: +typical@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/typical/-/typical-5.1.0.tgz#7116ca103caf2574985fc84fbaa8fd0ee5ea1684" integrity sha512-t5Ik8UAwBal1P1XzuVE4dc+RYQZicLUGJdvqr/vdqsED7SQECgsGBylldSsfWZL7RQjxT3xhQcKHWhLaVSR6YQ== @@ -10798,13 +10909,6 @@ unique-string@^1.0.0: dependencies: crypto-random-string "^1.0.0" -universal-user-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-3.0.0.tgz#4cc88d68097bffd7ac42e3b7c903e7481424b4b9" - integrity sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA== - dependencies: - os-name "^3.0.0" - universal-user-agent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-4.0.0.tgz#27da2ec87e32769619f68a14996465ea1cb9df16" @@ -10812,6 +10916,13 @@ universal-user-agent@^4.0.0: dependencies: os-name "^3.1.0" +universal-user-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-5.0.0.tgz#a3182aa758069bf0e79952570ca757de3579c1d9" + integrity sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q== + dependencies: + os-name "^3.1.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -10880,11 +10991,6 @@ url-parse-lax@^1.0.0: dependencies: prepend-http "^1.0.1" -url-template@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21" - integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE= - url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" From b70564b83ea54c7a006ed505cc77be5504c0fcc8 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Wed, 18 Mar 2020 18:09:29 +0000 Subject: [PATCH 048/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 21 +++++++++++++++++++++ packages/core/CHANGELOG.md | 17 +++++++++++++++++ packages/custom/CHANGELOG.md | 12 ++++++++++++ packages/jimp/CHANGELOG.md | 17 +++++++++++++++++ 4 files changed, 67 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf3f7df1a..4d11741ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,24 @@ +# v0.9.6 (Wed Mar 18 2020) + +#### 🐛 Bug Fix + +- `jimp` + - upgrade auto [#860](https://github.com/oliver-moran/jimp/pull/860) ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- `@jimp/core` + - Relax mkdirp dependency to allow newer minimist [#857](https://github.com/oliver-moran/jimp/pull/857) ([@Den-dp](https://github.com/Den-dp)) + +#### 🏠 Internal + +- Fix TypeScript error on 'next' [#858](https://github.com/oliver-moran/jimp/pull/858) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 3 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) +- Denis Bendrikov ([@Den-dp](https://github.com/Den-dp)) + +--- + # v0.9.5 (Tue Mar 03 2020) #### 🐛 Bug Fix diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 46b829756..695e82730 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,3 +1,20 @@ +# v0.9.6 (Wed Mar 18 2020) + +#### 🐛 Bug Fix + +- Relax mkdirp dependency to allow newer minimist [#857](https://github.com/oliver-moran/jimp/pull/857) ([@Den-dp](https://github.com/Den-dp)) + +#### 🏠 Internal + +- Fix TypeScript error on 'next' [#858](https://github.com/oliver-moran/jimp/pull/858) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 2 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) +- Denis Bendrikov ([@Den-dp](https://github.com/Den-dp)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/custom/CHANGELOG.md b/packages/custom/CHANGELOG.md index 36ecda1a0..43beb01b5 100644 --- a/packages/custom/CHANGELOG.md +++ b/packages/custom/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.9.6 (Wed Mar 18 2020) + +#### 🏠 Internal + +- Fix TypeScript error on 'next' [#858](https://github.com/oliver-moran/jimp/pull/858) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/jimp/CHANGELOG.md b/packages/jimp/CHANGELOG.md index 36ecda1a0..d5a1f1eb5 100644 --- a/packages/jimp/CHANGELOG.md +++ b/packages/jimp/CHANGELOG.md @@ -1,3 +1,20 @@ +# v0.9.6 (Wed Mar 18 2020) + +#### 🐛 Bug Fix + +- upgrade auto [#860](https://github.com/oliver-moran/jimp/pull/860) ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### 🏠 Internal + +- Fix TypeScript error on 'next' [#858](https://github.com/oliver-moran/jimp/pull/858) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From 231e9e39e315aa0821d259553877e54d57e9dd6f Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Wed, 18 Mar 2020 18:09:31 +0000 Subject: [PATCH 049/223] Bump version to: v0.9.6 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 1a15fd41e..6e3f66fad 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.5" + "version": "0.9.6" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 4cf207a8e..0232eae0b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.5", + "version": "0.9.6", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.5", + "jimp": "^0.9.6", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 2f8c849cb..bb884f9f6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.5", + "version": "0.9.6", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 30a687c21..382d5399a 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.5", + "version": "0.9.6", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 8f038fb76..4086aea79 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.5", + "version": "0.9.6", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 92827e0bd..d2108067b 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.5", + "version": "0.9.6", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 35221ad28..d5004ea58 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.5", + "version": "0.9.6", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 18801925e..c6d6a54db 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.5", + "version": "0.9.6", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 293ca4ac4..7c6a4dba5 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.5", + "version": "0.9.6", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 2ca998dc5..446bfb6de 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.5", + "version": "0.9.6", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 942f9849b..c63673ca8 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.5", + "version": "0.9.6", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 8100c7de3..e01d349e1 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.5", + "version": "0.9.6", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index dbe7f9227..a5c23a8d6 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.5", + "version": "0.9.6", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 2d6e25561..031b7e1b4 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.5", + "version": "0.9.6", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 8cf6049b6..f3ad3717b 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.5", + "version": "0.9.6", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 4c242b4a3..7066cfedd 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.5", + "version": "0.9.6", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index caedafb6a..f9878d81a 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.5", + "version": "0.9.6", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 082ff09c5..191d3206f 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.5", + "version": "0.9.6", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 9aa286552..49ee803d0 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.5", + "version": "0.9.6", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index f434fec17..aeef0e591 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.5", + "version": "0.9.6", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 807cf62fa..4108cf4ea 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.5", + "version": "0.9.6", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 2a738f94c..7deae8f9c 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.5", + "version": "0.9.6", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 83cec03ce..317b8b104 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.5", + "version": "0.9.6", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 24997e694..1f8f77283 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.5", + "version": "0.9.6", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 086dad579..176f0fc33 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.5", + "version": "0.9.6", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 6bd057738..0c92b6b3e 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.5", + "version": "0.9.6", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 74dc154eb..3f2c7a53f 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index e82c62837..55e854315 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.5", + "version": "0.9.6", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index bde33ec22..5b58d910d 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index e6dc2429f..dfec1e208 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 637474256..8ac51a213 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index a506dea4d..a4f466e70 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 496e12993..6447b5eb9 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index c5a4ca83d..a2940199e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.5", + "version": "0.9.6", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index a127e3988..955a0da4b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.5", + "version": "0.9.6", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From c0bd141d7aa3a9d50f3746efdaeb6404e21225ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 11:11:20 -0700 Subject: [PATCH 050/223] Bump handlebars from 4.2.1 to 4.7.3 (#861) Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.1 to 4.7.3. - [Release notes](https://github.com/wycats/handlebars.js/releases) - [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md) - [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.1...v4.7.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9cdf3717c..840e70749 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3564,6 +3564,11 @@ commander@^2.12.1, commander@^2.20.0, commander@^2.8.1, commander@~2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== +commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -5846,9 +5851,9 @@ growl@1.10.5: integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== handlebars@^4.1.2: - version "4.2.1" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.1.tgz#dc69c0e61604224f0c23b38b5b6741db210b57da" - integrity sha512-bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ== + version "4.7.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee" + integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -10816,7 +10821,15 @@ typical@^5.2.0: resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== -uglify-js@^3.1.4, uglify-js@^3.6.0: +uglify-js@^3.1.4: + version "3.8.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" + integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== + dependencies: + commander "~2.20.3" + source-map "~0.6.1" + +uglify-js@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5" integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg== From 441dc38d951e5956455831b4c512d9fe076d8624 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 11:25:18 -0700 Subject: [PATCH 051/223] Bump acorn from 6.3.0 to 6.4.1 (#854) Bumps [acorn](https://github.com/acornjs/acorn) from 6.3.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/yarn.lock b/yarn.lock index 840e70749..d6fb700e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1008,7 +1008,7 @@ which "^1.3.1" "@jimp/bmp@link:packages/type-bmp": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1016,7 +1016,7 @@ core-js "^3.4.1" "@jimp/core@link:packages/core": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1032,14 +1032,14 @@ tinycolor2 "^1.4.1" "@jimp/custom@link:packages/custom": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/core" "link:packages/core" core-js "^3.4.1" "@jimp/gif@link:packages/type-gif": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1047,7 +1047,7 @@ omggif "^1.0.9" "@jimp/jpeg@link:packages/type-jpeg": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1055,21 +1055,21 @@ jpeg-js "^0.3.4" "@jimp/plugin-blit@link:packages/plugin-blit": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-blur@link:packages/plugin-blur": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-color@link:packages/plugin-color": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1077,77 +1077,77 @@ tinycolor2 "^1.4.1" "@jimp/plugin-contain@link:packages/plugin-contain": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-cover@link:packages/plugin-cover": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-crop@link:packages/plugin-crop": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-displace@link:packages/plugin-displace": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-dither@link:packages/plugin-dither": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-flip@link:packages/plugin-flip": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-gaussian@link:packages/plugin-gaussian": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-invert@link:packages/plugin-invert": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-mask@link:packages/plugin-mask": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-normalize@link:packages/plugin-normalize": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-print@link:packages/plugin-print": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1155,28 +1155,28 @@ load-bmfont "^1.4.0" "@jimp/plugin-resize@link:packages/plugin-resize": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-rotate@link:packages/plugin-rotate": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugin-scale@link:packages/plugin-scale": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" core-js "^3.4.1" "@jimp/plugins@link:packages/plugins": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/plugin-blit" "link:packages/plugin-blit" @@ -1200,7 +1200,7 @@ timm "^1.6.1" "@jimp/png@link:packages/type-png": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1208,21 +1208,21 @@ pngjs "^3.3.3" "@jimp/test-utils@link:packages/test-utils": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" pngjs "^3.3.3" "@jimp/tiff@link:packages/type-tiff": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" utif "^2.0.1" "@jimp/types@link:packages/types": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" "@jimp/bmp" "link:packages/type-bmp" @@ -1234,7 +1234,7 @@ timm "^1.6.1" "@jimp/utils@link:packages/utils": - version "0.9.5" + version "0.9.6" dependencies: "@babel/runtime" "^7.7.2" core-js "^3.4.1" @@ -2288,9 +2288,9 @@ acorn-walk@^7.0.0: integrity sha512-7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg== acorn@^6.0.2, acorn@^6.0.7: - version "6.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" - integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.0.0: version "7.0.0" From dbd094f9ea8cd625cbaa0448302be633f51a35a9 Mon Sep 17 00:00:00 2001 From: Pasi Eronen Date: Wed, 18 Mar 2020 20:27:08 +0200 Subject: [PATCH 052/223] Relax version range of plugin-threshold peerDependencies (#859) --- packages/plugin-threshold/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 0c92b6b3e..5341e61be 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -26,8 +26,8 @@ }, "peerDependencies": { "@jimp/custom": ">=0.3.5", - "@jimp/plugin-color": "^0.8.0", - "@jimp/plugin-resize": "^0.8.0" + "@jimp/plugin-color": ">=0.8.0", + "@jimp/plugin-resize": ">=0.8.0" }, "devDependencies": { "@jimp/custom": "link:../custom", From 02997399e3c20d7ded15c091729d7b407ce57596 Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Fri, 27 Mar 2020 10:11:38 -0700 Subject: [PATCH 053/223] Added missing plugins to the types (#863) --- packages/jimp/types/test.ts | 1 + packages/jimp/types/ts3.1/test.ts | 4 ++ packages/plugins/index.d.ts | 103 +++++++++++++++++------------- 3 files changed, 63 insertions(+), 45 deletions(-) diff --git a/packages/jimp/types/test.ts b/packages/jimp/types/test.ts index 863484047..6287d9c01 100644 --- a/packages/jimp/types/test.ts +++ b/packages/jimp/types/test.ts @@ -18,6 +18,7 @@ jimpInst.func(); // Main Jimp export should already have all of these already applied Jimp.read('Test'); Jimp.displace(Jimp, 2); +Jimp.shadow((err, val, coords) => {}); Jimp.resize(40, 40); // $ExpectType 0 Jimp.PNG_FILTER_NONE; diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts index d0be22d22..51c78fa8c 100644 --- a/packages/jimp/types/ts3.1/test.ts +++ b/packages/jimp/types/ts3.1/test.ts @@ -18,6 +18,10 @@ jimpInst.func(); // Main Jimp export should already have all of these already applied Jimp.read('Test'); Jimp.displace(Jimp, 2); +Jimp.shadow((err, val, coords) => {}); +Jimp.fishEye({r: 12}); +Jimp.circle({radius: 12, x: 12, y: 12}); + Jimp.resize(40, 40); // $ExpectType 0 Jimp.PNG_FILTER_NONE; diff --git a/packages/plugins/index.d.ts b/packages/plugins/index.d.ts index 6dcfab7bd..07e46e0d2 100644 --- a/packages/plugins/index.d.ts +++ b/packages/plugins/index.d.ts @@ -1,38 +1,46 @@ -import dither from '@jimp/plugin-dither'; -import resize from '@jimp/plugin-resize'; import blit from '@jimp/plugin-blit'; -import rotate from '@jimp/plugin-rotate'; -import color from '@jimp/plugin-color'; -import print from '@jimp/plugin-print'; import blur from '@jimp/plugin-blur'; +import circle from '@jimp/plugin-circle'; +import color from '@jimp/plugin-color'; +import contain from '@jimp/plugin-contain'; +import cover from '@jimp/plugin-cover'; import crop from '@jimp/plugin-crop'; -import normalize from '@jimp/plugin-normalize'; -import invert from '@jimp/plugin-invert'; -import gaussian from '@jimp/plugin-gaussian'; +import displace from '@jimp/plugin-displace'; +import dither from '@jimp/plugin-dither'; +import fisheye from '@jimp/plugin-fisheye'; import flip from '@jimp/plugin-flip'; +import gaussian from '@jimp/plugin-gaussian'; +import invert from '@jimp/plugin-invert'; import mask from '@jimp/plugin-mask'; +import normalize from '@jimp/plugin-normalize'; +import print from '@jimp/plugin-print'; +import resize from '@jimp/plugin-resize'; +import rotate from '@jimp/plugin-rotate'; import scale from '@jimp/plugin-scale'; -import displace from '@jimp/plugin-displace'; -import contain from '@jimp/plugin-contain'; -import cover from '@jimp/plugin-cover'; +import shadow from '@jimp/plugin-shadow'; +import threshold from '@jimp/plugin-threshold'; -type DitherRet = ReturnType -type ResizeRet = ReturnType -type BlitRet = ReturnType -type RotateRet = ReturnType -type ColorRet = ReturnType -type PrintRet = ReturnType -type BlurRet = ReturnType -type CropRet = ReturnType -type NormalizeRet = ReturnType -type InvertRet = ReturnType -type GaussianRet = ReturnType -type FlipRet = ReturnType -type MaskRet = ReturnType -type ScaleRet = ReturnType -type DisplaceRet = ReturnType -type ContainRet = ReturnType -type CoverRet = ReturnType +type BlitRet = ReturnType; +type BlurRet = ReturnType; +type CircleRet = ReturnType; +type ColorRet = ReturnType; +type ContainRet = ReturnType; +type CoverRet = ReturnType; +type CropRet = ReturnType; +type DisplaceRet = ReturnType; +type DitherRet = ReturnType; +type FlipRet = ReturnType; +type FisheyeRet = ReturnType; +type GaussianRet = ReturnType; +type InvertRet = ReturnType; +type MaskRet = ReturnType; +type NormalizeRet = ReturnType; +type PrintRet = ReturnType; +type ResizeRet = ReturnType; +type RotateRet = ReturnType; +type ScaleRet = ReturnType; +type ShadowRet = ReturnType; +type ThresholdRet = ReturnType; /** * This is made union and not intersection to avoid issues with @@ -42,22 +50,27 @@ type CoverRet = ReturnType * In reality, this should be an intersection but our type data isn't * clever enough to figure out what's a class and what's not/etc */ -type Plugins = DitherRet | - ResizeRet | - BlitRet | - RotateRet | - ColorRet | - PrintRet | - BlurRet | - CropRet | - NormalizeRet | - InvertRet | - GaussianRet | - FlipRet | - MaskRet | - ScaleRet | - DisplaceRet | - ContainRet | - CoverRet; +type Plugins = + | BlitRet + | BlurRet + | CircleRet + | ColorRet + | ContainRet + | CoverRet + | CropRet + | DisplaceRet + | DitherRet + | FlipRet + | FisheyeRet + | GaussianRet + | InvertRet + | MaskRet + | NormalizeRet + | PrintRet + | ResizeRet + | RotateRet + | ScaleRet + | ShadowRet + | ThresholdRet; export default function(): Plugins; From 4d084fa8c51fcb248137e2e98f0641445d3dd35d Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 27 Mar 2020 17:41:08 +0000 Subject: [PATCH 054/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 19 +++++++++++++++++++ packages/jimp/CHANGELOG.md | 12 ++++++++++++ packages/plugin-threshold/CHANGELOG.md | 12 ++++++++++++ packages/plugins/CHANGELOG.md | 12 ++++++++++++ 4 files changed, 55 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d11741ea..41fa3f16b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# v0.9.7 (Fri Mar 27 2020) + +#### 🐛 Bug Fix + +- Bump acorn from 6.3.0 to 6.4.1 [#854](https://github.com/oliver-moran/jimp/pull/854) ([@dependabot[bot]](https://github.com/dependabot[bot])) +- Bump handlebars from 4.2.1 to 4.7.3 [#861](https://github.com/oliver-moran/jimp/pull/861) ([@dependabot[bot]](https://github.com/dependabot[bot])) +- `jimp`, `@jimp/plugins` + - Added missing plugins to the types [#863](https://github.com/oliver-moran/jimp/pull/863) ([@crutchcorn](https://github.com/crutchcorn)) +- `@jimp/plugin-threshold` + - Relax version range of plugin-threshold peerDependencies [#859](https://github.com/oliver-moran/jimp/pull/859) ([@pasieronen](https://github.com/pasieronen)) + +#### Authors: 3 + +- [@dependabot[bot]](https://github.com/dependabot[bot]) +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) +- Pasi Eronen ([@pasieronen](https://github.com/pasieronen)) + +--- + # v0.9.6 (Wed Mar 18 2020) #### 🐛 Bug Fix diff --git a/packages/jimp/CHANGELOG.md b/packages/jimp/CHANGELOG.md index d5a1f1eb5..28ee50cb5 100644 --- a/packages/jimp/CHANGELOG.md +++ b/packages/jimp/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.9.7 (Fri Mar 27 2020) + +#### 🐛 Bug Fix + +- Added missing plugins to the types [#863](https://github.com/oliver-moran/jimp/pull/863) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.6 (Wed Mar 18 2020) #### 🐛 Bug Fix diff --git a/packages/plugin-threshold/CHANGELOG.md b/packages/plugin-threshold/CHANGELOG.md index 36ecda1a0..e6eb403e5 100644 --- a/packages/plugin-threshold/CHANGELOG.md +++ b/packages/plugin-threshold/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.9.7 (Fri Mar 27 2020) + +#### 🐛 Bug Fix + +- Relax version range of plugin-threshold peerDependencies [#859](https://github.com/oliver-moran/jimp/pull/859) ([@pasieronen](https://github.com/pasieronen)) + +#### Authors: 1 + +- Pasi Eronen ([@pasieronen](https://github.com/pasieronen)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md index 36ecda1a0..aa4f5350b 100644 --- a/packages/plugins/CHANGELOG.md +++ b/packages/plugins/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.9.7 (Fri Mar 27 2020) + +#### 🐛 Bug Fix + +- Added missing plugins to the types [#863](https://github.com/oliver-moran/jimp/pull/863) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From c56d6f758a2404b3c4ef6682c7419cc42a0887c0 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 27 Mar 2020 17:41:10 +0000 Subject: [PATCH 055/223] Bump version to: v0.9.7 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 6e3f66fad..12d3718a2 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.6" + "version": "0.9.7" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 0232eae0b..7169c2d38 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.6", + "version": "0.9.7", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.6", + "jimp": "^0.9.7", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index bb884f9f6..5276e547c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.6", + "version": "0.9.7", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 382d5399a..667ecea27 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.6", + "version": "0.9.7", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 4086aea79..ed130bc03 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.6", + "version": "0.9.7", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index d2108067b..0e29ef6b3 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.6", + "version": "0.9.7", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index d5004ea58..dc802cde9 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.6", + "version": "0.9.7", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index c6d6a54db..d02b6b5fe 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.6", + "version": "0.9.7", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 7c6a4dba5..79699f12f 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.6", + "version": "0.9.7", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 446bfb6de..d6d867c8f 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.6", + "version": "0.9.7", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index c63673ca8..6e5722a55 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.6", + "version": "0.9.7", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index e01d349e1..16945d742 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.6", + "version": "0.9.7", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index a5c23a8d6..e0898b812 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.6", + "version": "0.9.7", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 031b7e1b4..a94ad3087 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.6", + "version": "0.9.7", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index f3ad3717b..11eee2062 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.6", + "version": "0.9.7", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 7066cfedd..4b19895a9 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.6", + "version": "0.9.7", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index f9878d81a..4e192c9ef 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.6", + "version": "0.9.7", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 191d3206f..74eb39ab4 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.6", + "version": "0.9.7", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 49ee803d0..3ea8216d6 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.6", + "version": "0.9.7", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index aeef0e591..1eb1f71b0 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.6", + "version": "0.9.7", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 4108cf4ea..219bdc627 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.6", + "version": "0.9.7", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 7deae8f9c..6fe4d5751 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.6", + "version": "0.9.7", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 317b8b104..741b89be5 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.6", + "version": "0.9.7", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 1f8f77283..22b7cec20 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.6", + "version": "0.9.7", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 176f0fc33..fa82b39d0 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.6", + "version": "0.9.7", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 5341e61be..0ca1517ef 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.6", + "version": "0.9.7", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 3f2c7a53f..4eb05cdb3 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 55e854315..c0d903d19 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.6", + "version": "0.9.7", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 5b58d910d..c8121f03a 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index dfec1e208..837b5b541 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 8ac51a213..fa3ad819d 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index a4f466e70..a45f2f46e 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 6447b5eb9..070a2f1d2 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index a2940199e..7f017a434 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.6", + "version": "0.9.7", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 955a0da4b..a5bae91b9 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.6", + "version": "0.9.7", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 7aae562b6705163068c69cf7f26da1d0fca7d38e Mon Sep 17 00:00:00 2001 From: Corbin Crutchley Date: Fri, 27 Mar 2020 17:06:30 -0700 Subject: [PATCH 056/223] Export the four missing plugins from plugin package (#866) --- packages/plugins/package.json | 4 +++ packages/plugins/src/index.js | 52 ++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 4eb05cdb3..0ccf4b743 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -20,12 +20,14 @@ "@babel/runtime": "^7.7.2", "@jimp/plugin-blit": "link:../plugin-blit", "@jimp/plugin-blur": "link:../plugin-blur", + "@jimp/plugin-circle": "link:../plugin-circle", "@jimp/plugin-color": "link:../plugin-color", "@jimp/plugin-contain": "link:../plugin-contain", "@jimp/plugin-cover": "link:../plugin-cover", "@jimp/plugin-crop": "link:../plugin-crop", "@jimp/plugin-displace": "link:../plugin-displace", "@jimp/plugin-dither": "link:../plugin-dither", + "@jimp/plugin-fisheye": "link:../plugin-fisheye", "@jimp/plugin-flip": "link:../plugin-flip", "@jimp/plugin-gaussian": "link:../plugin-gaussian", "@jimp/plugin-invert": "link:../plugin-invert", @@ -35,6 +37,8 @@ "@jimp/plugin-resize": "link:../plugin-resize", "@jimp/plugin-rotate": "link:../plugin-rotate", "@jimp/plugin-scale": "link:../plugin-scale", + "@jimp/plugin-shadow": "link:../plugin-shadow", + "@jimp/plugin-threshold": "link:../plugin-threshold", "core-js": "^3.4.1", "timm": "^1.6.1" }, diff --git a/packages/plugins/src/index.js b/packages/plugins/src/index.js index 5948bc1fd..56cc2243b 100644 --- a/packages/plugins/src/index.js +++ b/packages/plugins/src/index.js @@ -1,41 +1,49 @@ import { mergeDeep } from 'timm'; -import dither from '@jimp/plugin-dither'; -import resize from '@jimp/plugin-resize'; import blit from '@jimp/plugin-blit'; -import rotate from '@jimp/plugin-rotate'; -import color from '@jimp/plugin-color'; -import print from '@jimp/plugin-print'; import blur from '@jimp/plugin-blur'; +import circle from '@jimp/plugin-circle'; +import color from '@jimp/plugin-color'; +import contain from '@jimp/plugin-contain'; +import cover from '@jimp/plugin-cover'; import crop from '@jimp/plugin-crop'; -import normalize from '@jimp/plugin-normalize'; -import invert from '@jimp/plugin-invert'; -import gaussian from '@jimp/plugin-gaussian'; +import displace from '@jimp/plugin-displace'; +import dither from '@jimp/plugin-dither'; +import fisheye from '@jimp/plugin-fisheye'; import flip from '@jimp/plugin-flip'; +import gaussian from '@jimp/plugin-gaussian'; +import invert from '@jimp/plugin-invert'; import mask from '@jimp/plugin-mask'; +import normalize from '@jimp/plugin-normalize'; +import print from '@jimp/plugin-print'; +import resize from '@jimp/plugin-resize'; +import rotate from '@jimp/plugin-rotate'; import scale from '@jimp/plugin-scale'; -import displace from '@jimp/plugin-displace'; -import contain from '@jimp/plugin-contain'; -import cover from '@jimp/plugin-cover'; +import shadow from '@jimp/plugin-shadow'; +import threshold from '@jimp/plugin-threshold'; const plugins = [ - dither, - resize, blit, - rotate, - color, - print, blur, + circle, + color, + contain, + cover, crop, - normalize, - invert, - gaussian, + displace, + dither, + fisheye, flip, + gaussian, + invert, mask, + normalize, + print, + resize, + rotate, scale, - displace, - contain, - cover + shadow, + threshold ]; export default jimpEvChange => { From df1fd79f41c682bb70738291431c79e5d1d39321 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sat, 28 Mar 2020 00:13:37 +0000 Subject: [PATCH 057/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ packages/plugins/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41fa3f16b..a7997af9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.9.8 (Sat Mar 28 2020) + +#### 🐛 Bug Fix + +- `@jimp/plugins` + - Export the four missing plugins from plugin package [#866](https://github.com/oliver-moran/jimp/pull/866) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.7 (Fri Mar 27 2020) #### 🐛 Bug Fix diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md index aa4f5350b..a672e5a47 100644 --- a/packages/plugins/CHANGELOG.md +++ b/packages/plugins/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.9.8 (Sat Mar 28 2020) + +#### 🐛 Bug Fix + +- Export the four missing plugins from plugin package [#866](https://github.com/oliver-moran/jimp/pull/866) ([@crutchcorn](https://github.com/crutchcorn)) + +#### Authors: 1 + +- Corbin Crutchley ([@crutchcorn](https://github.com/crutchcorn)) + +--- + # v0.9.7 (Fri Mar 27 2020) #### 🐛 Bug Fix From 3a3df33f1fcf11899075ba87811d7c3d4f9bed21 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sat, 28 Mar 2020 00:13:38 +0000 Subject: [PATCH 058/223] Bump version to: v0.9.8 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 12d3718a2..8158716b3 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.7" + "version": "0.9.8" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 7169c2d38..1d2a886dc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.7", + "version": "0.9.8", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.7", + "jimp": "^0.9.8", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 5276e547c..0600d811c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.7", + "version": "0.9.8", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 667ecea27..686c368b2 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.7", + "version": "0.9.8", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index ed130bc03..a76192224 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.7", + "version": "0.9.8", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 0e29ef6b3..876e2ea6a 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.7", + "version": "0.9.8", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index dc802cde9..f214bd3bf 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.7", + "version": "0.9.8", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index d02b6b5fe..ed502bcde 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.7", + "version": "0.9.8", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 79699f12f..fe65dbff5 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.7", + "version": "0.9.8", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index d6d867c8f..13a5682cf 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.7", + "version": "0.9.8", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 6e5722a55..9b254ecf5 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.7", + "version": "0.9.8", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 16945d742..7474d29ef 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.7", + "version": "0.9.8", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index e0898b812..83d92182f 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.7", + "version": "0.9.8", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index a94ad3087..97d5bec92 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.7", + "version": "0.9.8", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 11eee2062..7b0866aaa 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.7", + "version": "0.9.8", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 4b19895a9..f83a87a91 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.7", + "version": "0.9.8", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 4e192c9ef..4ecac65ac 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.7", + "version": "0.9.8", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 74eb39ab4..962c23523 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.7", + "version": "0.9.8", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 3ea8216d6..8c9f2f091 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.7", + "version": "0.9.8", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 1eb1f71b0..20b9081cb 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.7", + "version": "0.9.8", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 219bdc627..18492ff14 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.7", + "version": "0.9.8", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 6fe4d5751..bf2457bc2 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.7", + "version": "0.9.8", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 741b89be5..b616cf100 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.7", + "version": "0.9.8", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 22b7cec20..5fb1a1acb 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.7", + "version": "0.9.8", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index fa82b39d0..af3337399 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.7", + "version": "0.9.8", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 0ca1517ef..a5eb126aa 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.7", + "version": "0.9.8", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 0ccf4b743..ef3427ecb 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index c0d903d19..76c4f71ea 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.7", + "version": "0.9.8", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index c8121f03a..60cfe3968 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 837b5b541..63bb31d10 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index fa3ad819d..a168c8270 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index a45f2f46e..7b4c33dd7 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 070a2f1d2..4e26518c3 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 7f017a434..1bc2e2a85 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.7", + "version": "0.9.8", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index a5bae91b9..062fb3275 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.7", + "version": "0.9.8", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From e1d05dadf5d2ff75b813de6535b48aae763247eb Mon Sep 17 00:00:00 2001 From: Emily Marigold Klassen Date: Sun, 29 Mar 2020 19:28:07 -0700 Subject: [PATCH 059/223] Properly split constructor and instance types (#867) * Properly split constructor and instance types Fixes #803 * Fix a preexisting typo in Well Formed Plugin detection * Also declare encoders and decoders types * Update types tests * Fix custom instance types * Fix tsTest errors * Fix typings for typescript 3.1 --- packages/core/types/jimp.d.ts | 128 ++++++++++++++------------- packages/core/types/utils.d.ts | 65 ++++++++++++-- packages/custom/types/index.d.ts | 11 +-- packages/custom/types/test.ts | 122 ++++++++++++++++--------- packages/jimp/types/ts3.1/index.d.ts | 23 ++++- packages/jimp/types/ts3.1/test.ts | 32 +++---- packages/type-jpeg/index.d.ts | 3 +- 7 files changed, 246 insertions(+), 138 deletions(-) diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts index 97fdce791..d82b0fa39 100644 --- a/packages/core/types/jimp.d.ts +++ b/packages/core/types/jimp.d.ts @@ -23,24 +23,7 @@ interface ScanIteratorReturn { } export interface JimpConstructors { - new(path: string, cb?: ImageCallback): this; - new(urlOptions: URLOptions, cb?: ImageCallback): this; - new(image: Jimp, cb?: ImageCallback): this; - new(data: Buffer, cb?: ImageCallback): this; - new(data: Bitmap, cb?: ImageCallback): this; - new(w: number, h: number, cb?: ImageCallback): this; - new( - w: number, - h: number, - background?: number | string, - cb?: ImageCallback - ): this; - // For custom constructors when using Jimp.appendConstructorOption - new(...args: any[]): this; -} - -export interface Jimp extends JimpConstructors { - prototype: this; + prototype: Jimp; // Constants AUTO: -1; // blend modes @@ -65,6 +48,70 @@ export interface Jimp extends JimpConstructors { EDGE_EXTEND: 1; EDGE_WRAP: 2; EDGE_CROP: 3; + + // Constructors + new(path: string, cb?: ImageCallback): this['prototype']; + new(urlOptions: URLOptions, cb?: ImageCallback): this['prototype']; + new(image: Jimp, cb?: ImageCallback): this['prototype']; + new(data: Buffer, cb?: ImageCallback): this['prototype']; + new(data: Bitmap, cb?: ImageCallback): this['prototype']; + new(w: number, h: number, cb?: ImageCallback): this['prototype']; + new( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ): this['prototype']; + // For custom constructors when using Jimp.appendConstructorOption + new(...args: any[]): this['prototype']; + + // Functions + /** + * I'd like to make `Args` generic and used in `run` and `test` but alas, + * it's not possible RN: + * https://github.com/microsoft/TypeScript/issues/26113 + */ + appendConstructorOption( + name: string, + test: (...args: any[]) => boolean, + run: ( + this: J, + resolve: (jimp?: J) => any, + reject: (reason: Error) => any, + ...args: any[] + ) => any + ): void; + read(path: string, cb?: ImageCallback): Promise; + read(image: Jimp, cb?: ImageCallback): Promise; + read(data: Buffer, cb?: ImageCallback): Promise; + read( + w: number, + h: number, + background?: number | string, + cb?: ImageCallback + ): Promise; + create(path: string): Promise; + create(image: Jimp): Promise; + create(data: Buffer): Promise; + create(w: number, h: number, background?: number | string): Promise; + rgbaToInt( + r: number, + g: number, + b: number, + a: number, + cb: GenericCallback + ): number; + intToRGBA(i: number, cb?: GenericCallback): RGBA; + cssColorToHex(cssColor: string): number; + limit255(n: number): number; + diff(img1: Jimp, img2: Jimp, threshold?: number): DiffReturn; + distance(img1: Jimp, img2: Jimp): number; + compareHashes(hash1: string, hash2: string): number; + colorDiff(rgba1: RGB, rgba2: RGB): number; + colorDiff(rgba1: RGBA, rgba2: RGBA): number; +} + +export interface Jimp { // Properties bitmap: Bitmap; _rgba: boolean; @@ -168,49 +215,4 @@ export interface Jimp extends JimpConstructors { options?: BlendMode, cb?: ImageCallback ): this; - - // Functions - /** - * I'd like to make `Args` generic and used in `run` and `test` but alas, - * it's not possible RN: - * https://github.com/microsoft/TypeScript/issues/26113 - */ - appendConstructorOption( - name: string, - test: (...args: any[]) => boolean, - run: ( - this: J, - resolve: (jimp?: J) => any, - reject: (reason: Error) => any, - ...args: any[] - ) => any - ): void; - read(path: string, cb?: ImageCallback): Promise; - read(image: Jimp, cb?: ImageCallback): Promise; - read(data: Buffer, cb?: ImageCallback): Promise; - read( - w: number, - h: number, - background?: number | string, - cb?: ImageCallback - ): Promise; - create(path: string): Promise; - create(image: Jimp): Promise; - create(data: Buffer): Promise; - create(w: number, h: number, background?: number | string): Promise; - rgbaToInt( - r: number, - g: number, - b: number, - a: number, - cb: GenericCallback - ): number; - intToRGBA(i: number, cb?: GenericCallback): RGBA; - cssColorToHex(cssColor: string): number; - limit255(n: number): number; - diff(img1: Jimp, img2: Jimp, threshold?: number): DiffReturn; - distance(img1: Jimp, img2: Jimp): number; - compareHashes(hash1: string, hash2: string): number; - colorDiff(rgba1: RGB, rgba2: RGB): number; - colorDiff(rgba1: RGBA, rgba2: RGBA): number; } diff --git a/packages/core/types/utils.d.ts b/packages/core/types/utils.d.ts index 72d63a555..64a205f71 100644 --- a/packages/core/types/utils.d.ts +++ b/packages/core/types/utils.d.ts @@ -10,11 +10,17 @@ export type UnionToIntersection = /** * The values to be extracted from a WellFormedPlugin to put onto the Jimp instance - * Left loose as "any" in order to enable the GetPluginValue to work properly + * Left loose as "any" in order to enable the GetPluginVal to work properly */ export type WellFormedValues = - (T extends {class: any} ? T['class'] : {}) & - (T extends {constants: any} ? T['constants'] : {}); + (T extends {class: infer Class} ? Class : {}); + +/** + * The constants to be extracted from a WellFormedPlugin to put onto the Jimp instance + * Left loose as "any" in order to enable the GetPluginConstants to work properly + */ +export type WellFormedConstants = + (T extends {constants: infer Constants} ? Constants : {}); // Util type for the functions that deal with `@jimp/custom` // Must accept any or no props thanks to typing of the `plugins` intersected function @@ -26,17 +32,27 @@ export type FunctionRet = Array<(...props: any[] | never) => T>; * up `undefined`. Because we're always extending `IllformedPlugin` on the * plugins, this should work fine */ -export type GetPluginVal = Q extends Required<{class: any}> | Required<{constant: any}> +export type GetPluginVal = Q extends Required<{class: any}> | Required<{constants: any}> ? WellFormedValues : Q; +export type GetPluginConst = Q extends Required<{class: any}> | Required<{constants: any}> + ? WellFormedConstants + : {}; + +export type GetPluginDecoders = Q extends Required<{class: any}> | Required<{constants: any}> + ? Q extends {decoders: infer Decoders} ? Decoders : {} : {}; + +export type GetPluginEncoders = Q extends Required<{class: any}> | Required<{constants: any}> + ? Q extends {encoders: infer Encoders} ? Encoders : {} : {}; + type GetPluginFuncArrValues = // Given an array of types infer `Q` (Q should be the type value) - PluginFuncArr extends Array<() => infer Q> + PluginFuncArr extends ReadonlyArray ? F extends () => infer Q ? // Get the plugin value, may be ill-formed or well-formed GetPluginVal : // This should never be reached - undefined; + undefined : undefined; /** * A helper type to get the values to be intersected with `Jimp` to give @@ -44,7 +60,42 @@ type GetPluginFuncArrValues = */ export type GetIntersectionFromPlugins< PluginFuncArr extends FunctionRet -> = UnionToIntersection>; +> = UnionToIntersection, undefined>>; + +type GetPluginFuncArrConsts = + // Given an array of types infer `Q` (Q should be the type value) + PluginFuncArr extends ReadonlyArray ? F extends () => infer Q + ? // Get the plugin constants, may be ill-formed or well-formed + GetPluginConst + : // This should never be reached + undefined : undefined; + +type GetPluginFuncArrEncoders = + // Given an array of types infer `Q` (Q should be the type value) + PluginFuncArr extends ReadonlyArray ? F extends () => infer Q + ? // Get the plugin encoders, may be ill-formed or well-formed + GetPluginEncoders + : // This should never be reached + undefined : undefined; + +type GetPluginFuncArrDecoders = + // Given an array of types infer `Q` (Q should be the type value) + PluginFuncArr extends ReadonlyArray ? F extends () => infer Q + ? // Get the plugin decoders, may be ill-formed or well-formed + GetPluginDecoders + : // This should never be reached + undefined : undefined; + +/** + * A helper type to get the statics to be intersected with `Jimp` to give + * the proper typing given an array of functions for plugins and types + */ +export type GetIntersectionFromPluginsStatics< + PluginFuncArr extends FunctionRet +> = UnionToIntersection> & { + encoders: UnionToIntersection>; + decoders: UnionToIntersection>; +}; /** * While this was added to TS 3.5, in order to support down to TS 2.8, we need diff --git a/packages/custom/types/index.d.ts b/packages/custom/types/index.d.ts index 196f27f5e..bdd653426 100644 --- a/packages/custom/types/index.d.ts +++ b/packages/custom/types/index.d.ts @@ -6,21 +6,22 @@ import { JimpPlugin, JimpType, GetIntersectionFromPlugins, + GetIntersectionFromPluginsStatics, JimpConstructors } from '@jimp/core'; type JimpInstance< TypesFuncArr extends FunctionRet | undefined, PluginFuncArr extends FunctionRet | undefined, - J extends Jimp -> = Exclude & - GetIntersectionFromPlugins> & - JimpConstructors; + J extends JimpConstructors +> = J & GetIntersectionFromPluginsStatics> & { + prototype: JimpType & GetIntersectionFromPlugins> +}; declare function configure< TypesFuncArr extends FunctionRet | undefined = undefined, PluginFuncArr extends FunctionRet | undefined = undefined, - J extends Jimp = Jimp + J extends JimpConstructors = JimpConstructors >( configuration: { types?: TypesFuncArr; diff --git a/packages/custom/types/test.ts b/packages/custom/types/test.ts index 8b4ce6d65..9b7f20a30 100644 --- a/packages/custom/types/test.ts +++ b/packages/custom/types/test.ts @@ -23,10 +23,15 @@ test('should function the same as the `jimp` types', () => { const jimpInst = new FullCustomJimp('test'); // Main Jimp export should already have all of these already applied + // $ExpectError jimpInst.read('Test'); jimpInst.displace(jimpInst, 2); jimpInst.resize(40, 40); - // $ExpectType 0 + jimpInst.displace(jimpInst, 2); + jimpInst.shadow((err, val, coords) => {}); + jimpInst.fishEye({r: 12}); + jimpInst.circle({radius: 12, x: 12, y: 12}); + // $ExpectError jimpInst.PNG_FILTER_NONE; // $ExpectError @@ -37,8 +42,7 @@ test('should function the same as the `jimp` types', () => { // Main Jimp export should already have all of these already applied FullCustomJimp.read('Test'); - FullCustomJimp.displace(FullCustomJimp, 2); - FullCustomJimp.resize(40, 40); + // $ExpectType 0 FullCustomJimp.PNG_FILTER_NONE; @@ -52,12 +56,12 @@ test('should function the same as the `jimp` types', () => { const baseImage = await FullCustomJimp.read('filename'); const cloneBaseImage = baseImage.clone(); - // $ExpectType -1 - cloneBaseImage.PNG_FILTER_AUTO; + // $ExpectType number + cloneBaseImage._deflateLevel; test('can handle `this` returns on the core type properly', () => { - // $ExpectType -1 - cloneBaseImage.diff(jimpInst, jimpInst).image.PNG_FILTER_AUTO + // $ExpectType number + cloneBaseImage.posterize(3)._quality }); test('can handle `this` returns properly', () => { @@ -69,16 +73,17 @@ test('should function the same as the `jimp` types', () => { .resize(1, 1) .quality(1) .deflateLevel(2) - .PNG_FILTER_AUTO; + ._filterType; }); test('can handle imageCallbacks `this` properly', () => { cloneBaseImage.rgba(false, (_, jimpCBIn) => { + // $ExpectError jimpCBIn.read('Test'); jimpCBIn.displace(jimpInst, 2); jimpCBIn.resize(40, 40); - // $ExpectType 0 - jimpCBIn.PNG_FILTER_NONE; + // $ExpectType number + jimpCBIn._filterType; // $ExpectError jimpCBIn.test; @@ -88,22 +93,42 @@ test('should function the same as the `jimp` types', () => { }) }) }); + + test('Can handle callback with constructor', () => { + const myBmpBuffer: Buffer = {} as any; + + Jimp.read(myBmpBuffer, (err, cbJimpInst) => { + // $ExpectError + cbJimpInst.read('Test'); + cbJimpInst.displace(jimpInst, 2); + cbJimpInst.resize(40, 40); + // $ExpectType number + cbJimpInst._filterType; + + // $ExpectError + cbJimpInst.test; + + // $ExpectError + cbJimpInst.func(); + }); + }); + }); test('can handle custom jimp', () => { - // Methods from types should be applied - CustomJimp.deflateLevel(4); // Constants from types should be applied // $ExpectType 0 CustomJimp.PNG_FILTER_NONE; // Core functions should still work from Jimp CustomJimp.read('Test'); - - // Constants should be applied from ill-formed plugins + + // Constants should not(?) be applied from ill-formed plugins + // $ExpectError CustomJimp.displace(CustomJimp, 2); - - // Methods should be applied from well-formed plugins + + // Methods should be applied from well-formed plugins only to the instance + // $ExpectError CustomJimp.resize(40, 40) // Constants should be applied from well-formed plugins @@ -118,12 +143,12 @@ test('can handle custom jimp', () => { const Jiimp = new CustomJimp('test'); // Methods from types should be applied Jiimp.deflateLevel(4); - // Constants from types should be applied - // $ExpectType 0 + // Constants from types should be applied to the static only + // $ExpectError Jiimp.PNG_FILTER_NONE; // Core functions should still work from Jimp - Jiimp.read('Test'); + Jiimp.getPixelColor(1, 1); // Constants should be applied from ill-formed plugins Jiimp.displace(Jiimp, 2); @@ -131,7 +156,8 @@ test('can handle custom jimp', () => { // Methods should be applied from well-formed plugins Jiimp.resize(40, 40) - // Constants should be applied from well-formed plugins + // Constants should not be applied to the object + // $ExpectError Jiimp.RESIZE_NEAREST_NEIGHBOR // $ExpectError @@ -145,12 +171,6 @@ test('can compose', () => { const OtherCustomJimp = configure({ plugins: [scale] }, CustomJimp); - - // Methods from new plugins should be applied - OtherCustomJimp.scale(3); - - // Methods from types should be applied - OtherCustomJimp.filterType(4); // Constants from types should be applied // $ExpectType 0 OtherCustomJimp.PNG_FILTER_NONE; @@ -158,10 +178,12 @@ test('can compose', () => { // Core functions should still work from Jimp OtherCustomJimp.read('Test'); - // Constants should be applied from ill-formed plugins + // Constants should not be applied to the static instance from ill-formed plugins + // $ExpectError OtherCustomJimp.displace(OtherCustomJimp, 2); - // Methods should be applied from well-formed plugins + // Methods should not be applied to the static instance from well-formed plugins + // $ExpectError OtherCustomJimp.resize(40, 40); // Constants should be applied from well-formed plugins @@ -176,12 +198,18 @@ test('can compose', () => { const Jiimp = new OtherCustomJimp('test'); // Methods from types should be applied Jiimp.deflateLevel(4); - // Constants from types should be applied - // $ExpectType 0 + // Constants from types should not be applied to objects + // $ExpectError Jiimp.PNG_FILTER_NONE; + // Methods from new plugins should be applied + Jiimp.scale(3); + + // Methods from types should be applied + Jiimp.filterType(4); + // Core functions should still work from Jimp - Jiimp.read('Test'); + Jiimp.getPixelColor(1, 1); // Constants should be applied from ill-formed plugins Jiimp.displace(Jiimp, 2); @@ -189,7 +217,8 @@ test('can compose', () => { // Methods should be applied from well-formed plugins Jiimp.resize(40, 40) - // Constants should be applied from well-formed plugins + // Constants should not be applied from well-formed plugins to objects + // $ExpectError Jiimp.RESIZE_NEAREST_NEIGHBOR // $ExpectError @@ -207,10 +236,12 @@ test('can handle only plugins', () => { // Core functions should still work from Jimp PluginsJimp.read('Test'); - // Constants should be applied from ill-formed plugins + // Constants should not be applied from ill-formed plugins + // $ExpectError PluginsJimp.displace(PluginsJimp, 2); - // Methods should be applied from well-formed plugins + // Methods should be not be applied to from well-formed plugins to the top level + // $ExpectError PluginsJimp.resize(40, 40); // Constants should be applied from well-formed plugins @@ -226,7 +257,7 @@ test('can handle only plugins', () => { const Jiimp = new PluginsJimp('test'); // Core functions should still work from Jimp - Jiimp.read('Test'); + Jiimp.getPixelColor(1, 1); // Constants should be applied from ill-formed plugins Jiimp.displace(Jiimp, 2); @@ -234,7 +265,8 @@ test('can handle only plugins', () => { // Methods should be applied from well-formed plugins Jiimp.resize(40, 40) - // Constants should be applied from well-formed plugins + // Constants should be not applied to objects from well-formed plugins + // $ExpectError Jiimp.RESIZE_NEAREST_NEIGHBOR // $ExpectError @@ -249,7 +281,8 @@ test('can handle only all types', () => { types: [types] }); - // Methods from types should be applied + // Methods from types should not be applied + // $ExpectError TypesJimp.filterType(4); // Constants from types should be applied // $ExpectType 0 @@ -264,8 +297,8 @@ test('can handle only all types', () => { const Jiimp = new TypesJimp('test'); // Methods from types should be applied Jiimp.filterType(4); - // Constants from types should be applied - // $ExpectType 0 + // Constants from types should be not applied to objects + // $ExpectError Jiimp.PNG_FILTER_NONE; // $ExpectError @@ -300,8 +333,8 @@ test('can handle only one type', () => { // $ExpectError Jiimp.MIME_TIFF; - // Constants from types should be applied - // $ExpectType 0 + // Constants from types should not be applied to objects + // $ExpectError Jiimp.PNG_FILTER_NONE; // $ExpectError @@ -325,6 +358,7 @@ test('can handle only one plugin', () => { // $ExpectType "nearestNeighbor" ResizeJimp.RESIZE_NEAREST_NEIGHBOR; + // $ExpectError ResizeJimp.resize(2, 2); // $ExpectError @@ -334,13 +368,13 @@ test('can handle only one plugin', () => { ResizeJimp.func(); - const Jiimp: typeof ResizeJimp = new ResizeJimp('test'); + const Jiimp: InstanceType = new ResizeJimp('test'); // Constants from other plugins should be not applied // $ExpectError Jiimp.FONT_SANS_8_BLACK; - // Constants from plugin should be applied - // $ExpectType "nearestNeighbor" + // Constants from plugin should not be applied to the object + // $ExpectError Jiimp.RESIZE_NEAREST_NEIGHBOR; Jiimp.resize(2, 2); diff --git a/packages/jimp/types/ts3.1/index.d.ts b/packages/jimp/types/ts3.1/index.d.ts index a537710d5..08877f8bc 100644 --- a/packages/jimp/types/ts3.1/index.d.ts +++ b/packages/jimp/types/ts3.1/index.d.ts @@ -12,6 +12,9 @@ import { RGBA, UnionToIntersection, GetPluginVal, + GetPluginConst, + GetPluginEncoders, + GetPluginDecoders, JimpConstructors } from '@jimp/core'; import typeFn from '@jimp/types'; @@ -24,8 +27,24 @@ type IntersectedPluginTypes = UnionToIntersection< GetPluginVal | GetPluginVal >; -type Jimp = InstanceType & IntersectedPluginTypes; +type IntersectedPluginConsts = UnionToIntersection< + GetPluginConst | GetPluginConst +>; + +type IntersectedPluginEncoders = UnionToIntersection< + GetPluginEncoders | GetPluginEncoders +>; + +type IntersectedPluginDecoders = UnionToIntersection< + GetPluginDecoders | GetPluginDecoders +>; + +type Jimp = JimpType & IntersectedPluginTypes; -declare const Jimp: JimpConstructors & Jimp; +declare const Jimp: JimpConstructors & IntersectedPluginConsts & { + prototype: Jimp; + encoders: IntersectedPluginEncoders; + decoders: IntersectedPluginDecoders; +}; export = Jimp; diff --git a/packages/jimp/types/ts3.1/test.ts b/packages/jimp/types/ts3.1/test.ts index 51c78fa8c..ae64a4876 100644 --- a/packages/jimp/types/ts3.1/test.ts +++ b/packages/jimp/types/ts3.1/test.ts @@ -3,10 +3,15 @@ import * as Jimp from 'jimp'; const jimpInst: Jimp = new Jimp('test'); // Main Jimp export should already have all of these already applied +// $ExpectError jimpInst.read('Test'); jimpInst.displace(jimpInst, 2); jimpInst.resize(40, 40); -// $ExpectType 0 +jimpInst.displace(jimpInst, 2); +jimpInst.shadow((err, val, coords) => {}); +jimpInst.fishEye({r: 12}); +jimpInst.circle({radius: 12, x: 12, y: 12}); +// $ExpectError jimpInst.PNG_FILTER_NONE; // $ExpectError @@ -17,12 +22,7 @@ jimpInst.func(); // Main Jimp export should already have all of these already applied Jimp.read('Test'); -Jimp.displace(Jimp, 2); -Jimp.shadow((err, val, coords) => {}); -Jimp.fishEye({r: 12}); -Jimp.circle({radius: 12, x: 12, y: 12}); -Jimp.resize(40, 40); // $ExpectType 0 Jimp.PNG_FILTER_NONE; @@ -36,12 +36,12 @@ test('can clone properly', async () => { const baseImage = await Jimp.read('filename'); const cloneBaseImage = baseImage.clone(); - // $ExpectType -1 - cloneBaseImage.PNG_FILTER_AUTO; + // $ExpectType number + cloneBaseImage._deflateLevel; test('can handle `this` returns on the core type properly', () => { - // $ExpectType -1 - cloneBaseImage.diff(jimpInst, jimpInst).image.PNG_FILTER_AUTO + // $ExpectType number + cloneBaseImage.posterize(3)._quality }); test('can handle `this` returns properly', () => { @@ -53,16 +53,17 @@ test('can clone properly', async () => { .resize(1, 1) .quality(1) .deflateLevel(2) - .PNG_FILTER_AUTO; + ._filterType; }); test('can handle imageCallbacks `this` properly', () => { cloneBaseImage.rgba(false, (_, jimpCBIn) => { + // $ExpectError jimpCBIn.read('Test'); jimpCBIn.displace(jimpInst, 2); jimpCBIn.resize(40, 40); - // $ExpectType 0 - jimpCBIn.PNG_FILTER_NONE; + // $ExpectType number + jimpCBIn._filterType; // $ExpectError jimpCBIn.test; @@ -77,11 +78,12 @@ test('Can handle callback with constructor', () => { const myBmpBuffer: Buffer = {} as any; Jimp.read(myBmpBuffer, (err, cbJimpInst) => { + // $ExpectError cbJimpInst.read('Test'); cbJimpInst.displace(jimpInst, 2); cbJimpInst.resize(40, 40); - // $ExpectType 0 - cbJimpInst.PNG_FILTER_NONE; + // $ExpectType number + cbJimpInst._filterType; // $ExpectError cbJimpInst.test; diff --git a/packages/type-jpeg/index.d.ts b/packages/type-jpeg/index.d.ts index 9460dbe95..3423874db 100644 --- a/packages/type-jpeg/index.d.ts +++ b/packages/type-jpeg/index.d.ts @@ -1,7 +1,6 @@ import { DecoderFn, EncoderFn, ImageCallback } from '@jimp/core'; interface JpegClass { - MIME_JPEG: 'image/jpeg'; _quality: number; quality: (n: number, cb?: ImageCallback) => this; } @@ -10,7 +9,7 @@ interface Jpeg { mime: { 'image/jpeg': string[] }, constants: { - 'image/jpeg': string + MIME_JPEG: 'image/jpeg'; } encoders: { From 1add0ba0a41fb80ac4fa68cda86dc3eabfa2cbec Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Mon, 30 Mar 2020 02:37:04 +0000 Subject: [PATCH 060/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ packages/core/CHANGELOG.md | 12 ++++++++++++ packages/custom/CHANGELOG.md | 12 ++++++++++++ packages/jimp/CHANGELOG.md | 12 ++++++++++++ packages/type-jpeg/CHANGELOG.md | 12 ++++++++++++ 5 files changed, 61 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7997af9e..9be79f5cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.10.0 (Mon Mar 30 2020) + +#### 🚀 Enhancement + +- `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/jpeg` + - Properly split constructor and instance types [#867](https://github.com/oliver-moran/jimp/pull/867) ([@forivall](https://github.com/forivall)) + +#### Authors: 1 + +- Emily Marigold Klassen ([@forivall](https://github.com/forivall)) + +--- + # v0.9.8 (Sat Mar 28 2020) #### 🐛 Bug Fix diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 695e82730..38e45c387 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.0 (Mon Mar 30 2020) + +#### 🚀 Enhancement + +- Properly split constructor and instance types [#867](https://github.com/oliver-moran/jimp/pull/867) ([@forivall](https://github.com/forivall)) + +#### Authors: 1 + +- Emily Marigold Klassen ([@forivall](https://github.com/forivall)) + +--- + # v0.9.6 (Wed Mar 18 2020) #### 🐛 Bug Fix diff --git a/packages/custom/CHANGELOG.md b/packages/custom/CHANGELOG.md index 43beb01b5..814fff8db 100644 --- a/packages/custom/CHANGELOG.md +++ b/packages/custom/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.0 (Mon Mar 30 2020) + +#### 🚀 Enhancement + +- Properly split constructor and instance types [#867](https://github.com/oliver-moran/jimp/pull/867) ([@forivall](https://github.com/forivall)) + +#### Authors: 1 + +- Emily Marigold Klassen ([@forivall](https://github.com/forivall)) + +--- + # v0.9.6 (Wed Mar 18 2020) #### 🏠 Internal diff --git a/packages/jimp/CHANGELOG.md b/packages/jimp/CHANGELOG.md index 28ee50cb5..96ca4370c 100644 --- a/packages/jimp/CHANGELOG.md +++ b/packages/jimp/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.0 (Mon Mar 30 2020) + +#### 🚀 Enhancement + +- Properly split constructor and instance types [#867](https://github.com/oliver-moran/jimp/pull/867) ([@forivall](https://github.com/forivall)) + +#### Authors: 1 + +- Emily Marigold Klassen ([@forivall](https://github.com/forivall)) + +--- + # v0.9.7 (Fri Mar 27 2020) #### 🐛 Bug Fix diff --git a/packages/type-jpeg/CHANGELOG.md b/packages/type-jpeg/CHANGELOG.md index 36ecda1a0..96e18f3d5 100644 --- a/packages/type-jpeg/CHANGELOG.md +++ b/packages/type-jpeg/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.0 (Mon Mar 30 2020) + +#### 🚀 Enhancement + +- Properly split constructor and instance types [#867](https://github.com/oliver-moran/jimp/pull/867) ([@forivall](https://github.com/forivall)) + +#### Authors: 1 + +- Emily Marigold Klassen ([@forivall](https://github.com/forivall)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From c23237b41f76be00987a37484cf17dce3a243e2e Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Mon, 30 Mar 2020 02:37:06 +0000 Subject: [PATCH 061/223] Bump version to: v0.10.0 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 8158716b3..8ca22a3d6 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.9.8" + "version": "0.10.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 1d2a886dc..dac2ca44c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.9.8", + "version": "0.10.0", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.9.8", + "jimp": "^0.10.0", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 0600d811c..34aec6c0d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.9.8", + "version": "0.10.0", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 686c368b2..aa43f1805 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.9.8", + "version": "0.10.0", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index a76192224..6aa4dc0ad 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.9.8", + "version": "0.10.0", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 876e2ea6a..0a3c59194 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.9.8", + "version": "0.10.0", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index f214bd3bf..adec67027 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.9.8", + "version": "0.10.0", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index ed502bcde..e326c3466 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.9.8", + "version": "0.10.0", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index fe65dbff5..4cdc01bd3 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.9.8", + "version": "0.10.0", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 13a5682cf..a44c29de0 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.9.8", + "version": "0.10.0", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 9b254ecf5..035208a75 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.9.8", + "version": "0.10.0", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 7474d29ef..88b5fa56a 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.9.8", + "version": "0.10.0", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 83d92182f..5dcea1825 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.9.8", + "version": "0.10.0", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 97d5bec92..af5909ada 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.9.8", + "version": "0.10.0", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 7b0866aaa..eedc78e51 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.9.8", + "version": "0.10.0", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index f83a87a91..200ad3ddd 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.9.8", + "version": "0.10.0", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 4ecac65ac..fb31f0f05 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.9.8", + "version": "0.10.0", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 962c23523..3960fba8a 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.9.8", + "version": "0.10.0", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 8c9f2f091..4e80dd5bf 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.9.8", + "version": "0.10.0", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 20b9081cb..4588ad169 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.9.8", + "version": "0.10.0", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 18492ff14..e1145efac 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.9.8", + "version": "0.10.0", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index bf2457bc2..f1323e8ba 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.9.8", + "version": "0.10.0", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index b616cf100..e416b6615 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.9.8", + "version": "0.10.0", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 5fb1a1acb..f3bad533a 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.9.8", + "version": "0.10.0", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index af3337399..4075e709c 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.9.8", + "version": "0.10.0", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index a5eb126aa..b2144e8fd 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.9.8", + "version": "0.10.0", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index ef3427ecb..7efb00837 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 76c4f71ea..eb0918cd5 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.9.8", + "version": "0.10.0", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 60cfe3968..849e63ada 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 63bb31d10..05a21266f 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index a168c8270..6c615ffd2 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 7b4c33dd7..c9a339807 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 4e26518c3..20e7f47c3 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 1bc2e2a85..c0df51bb4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.9.8", + "version": "0.10.0", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 062fb3275..02fa3884d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.9.8", + "version": "0.10.0", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 3cc4a4c5f09e2f492031b54bf771d8aa3d9eabd6 Mon Sep 17 00:00:00 2001 From: xinbenlv Date: Sun, 29 Mar 2020 19:39:31 -0700 Subject: [PATCH 062/223] Fix a `loadFont` and case inconsistency of `jimp` (#868) --- packages/plugin-print/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/plugin-print/README.md b/packages/plugin-print/README.md index 2d5f9daf3..ebbb1d317 100644 --- a/packages/plugin-print/README.md +++ b/packages/plugin-print/README.md @@ -41,10 +41,10 @@ Loads a bitmap font from a file - @returns {Promise} a promise ```js -import jimp from 'jimp'; +import Jimp from 'jimp'; async function main() { - const font = await jimp.read(jimp.FONT_SANS_32_BLACK); + const font = await Jimp.loadFont(Jimp.FONT_SANS_32_BLACK); } main(); @@ -143,13 +143,13 @@ image.print( Measure how wide a piece of text will be. ```js -import jimp from 'jimp'; +import Jimp from 'jimp'; async function main() { - const font = await jimp.read(jimp.FONT_SANS_32_BLACK); - const image = await jimp.read(1000, 1000, 0x0000ffff); + const font = await Jimp.loadFont(Jimp.FONT_SANS_32_BLACK); + const image = await Jimp.read(1000, 1000, 0x0000ffff); - jimp.measureText(font, 'Hello World!'); + Jimp.measureText(font, 'Hello World!'); } main(); @@ -160,13 +160,13 @@ main(); Measure how tall a piece of text will be. ```js -import jimp from 'jimp'; +import Jimp from 'jimp'; async function main() { - const font = await jimp.read(jimp.FONT_SANS_32_BLACK); - const image = await jimp.read(1000, 1000, 0x0000ffff); + const font = await Jimp.loadFont(Jimp.FONT_SANS_32_BLACK); + const image = await Jimp.read(1000, 1000, 0x0000ffff); - jimp.measureTextHeight(font, 'Hello World!', 100); + Jimp.measureTextHeight(font, 'Hello World!', 100); } main(); From bd5ba89320dd1b3971cbdb895f126a8c843ecb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Sun, 5 Apr 2020 20:07:02 +0200 Subject: [PATCH 063/223] Update package.json (#870) --- packages/utils/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/utils/package.json b/packages/utils/package.json index 02fa3884d..903202a3b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -21,6 +21,7 @@ }, "dependencies": { "@babel/runtime": "^7.7.2", - "core-js": "^3.4.1" + "core-js": "^3.4.1", + "regenerator-runtime": "^0.13.3" } } From da6bf75de53454b2a02a5ce191e21e1a601928f7 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sun, 5 Apr 2020 18:14:27 +0000 Subject: [PATCH 064/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 19 +++++++++++++++++++ packages/plugin-print/CHANGELOG.md | 12 ++++++++++++ packages/utils/CHANGELOG.md | 12 ++++++++++++ 3 files changed, 43 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9be79f5cc..4d3128faa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# v0.10.1 (Sun Apr 05 2020) + +#### 🐛 Bug Fix + +- `@jimp/utils` + - Update package.json [#870](https://github.com/oliver-moran/jimp/pull/870) ([@arcanis](https://github.com/arcanis)) + +#### 📝 Documentation + +- `@jimp/plugin-print` + - Fix a `loadFont` and case inconsistency of `jimp` [#868](https://github.com/oliver-moran/jimp/pull/868) ([@xinbenlv](https://github.com/xinbenlv)) + +#### Authors: 2 + +- Maël Nison ([@arcanis](https://github.com/arcanis)) +- xinbenlv ([@xinbenlv](https://github.com/xinbenlv)) + +--- + # v0.10.0 (Mon Mar 30 2020) #### 🚀 Enhancement diff --git a/packages/plugin-print/CHANGELOG.md b/packages/plugin-print/CHANGELOG.md index ba469065f..60779ac95 100644 --- a/packages/plugin-print/CHANGELOG.md +++ b/packages/plugin-print/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.1 (Sun Apr 05 2020) + +#### 📝 Documentation + +- Fix a `loadFont` and case inconsistency of `jimp` [#868](https://github.com/oliver-moran/jimp/pull/868) ([@xinbenlv](https://github.com/xinbenlv)) + +#### Authors: 1 + +- xinbenlv ([@xinbenlv](https://github.com/xinbenlv)) + +--- + # v0.9.5 (Tue Mar 03 2020) #### 🐛 Bug Fix diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 68b402aa5..3ecb2b57e 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.1 (Sun Apr 05 2020) + +#### 🐛 Bug Fix + +- Update package.json [#870](https://github.com/oliver-moran/jimp/pull/870) ([@arcanis](https://github.com/arcanis)) + +#### Authors: 1 + +- Maël Nison ([@arcanis](https://github.com/arcanis)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From 44ce60b5cc53ee60cd5c63d4dc0ecf26fd3d431e Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sun, 5 Apr 2020 18:14:28 +0000 Subject: [PATCH 065/223] Bump version to: v0.10.1 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 8ca22a3d6..f2049daed 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.10.0" + "version": "0.10.1" } diff --git a/packages/cli/package.json b/packages/cli/package.json index dac2ca44c..9bc26f2d5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.10.0", + "version": "0.10.1", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.10.0", + "jimp": "^0.10.1", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 34aec6c0d..446d35da6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.10.0", + "version": "0.10.1", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index aa43f1805..0923b421b 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.10.0", + "version": "0.10.1", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 6aa4dc0ad..4f1a76641 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.10.0", + "version": "0.10.1", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 0a3c59194..728216c23 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.10.0", + "version": "0.10.1", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index adec67027..ac6b221d5 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.10.0", + "version": "0.10.1", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index e326c3466..fa5156cd2 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.10.0", + "version": "0.10.1", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 4cdc01bd3..2e41c14a0 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.10.0", + "version": "0.10.1", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index a44c29de0..752a27c89 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.10.0", + "version": "0.10.1", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 035208a75..08fe36c59 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.10.0", + "version": "0.10.1", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 88b5fa56a..78b8a5739 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.10.0", + "version": "0.10.1", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 5dcea1825..5986432a1 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.10.0", + "version": "0.10.1", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index af5909ada..cdc8ef273 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.10.0", + "version": "0.10.1", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index eedc78e51..db3e0c210 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.10.0", + "version": "0.10.1", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 200ad3ddd..28536c122 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.10.0", + "version": "0.10.1", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index fb31f0f05..659a1f0f3 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.10.0", + "version": "0.10.1", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 3960fba8a..965f409b6 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.10.0", + "version": "0.10.1", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 4e80dd5bf..394d23a32 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.10.0", + "version": "0.10.1", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 4588ad169..aab6d290c 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.10.0", + "version": "0.10.1", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index e1145efac..af2f9d832 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.10.0", + "version": "0.10.1", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index f1323e8ba..360b31dc4 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.10.0", + "version": "0.10.1", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index e416b6615..1abc3b3aa 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.10.0", + "version": "0.10.1", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index f3bad533a..0ae02b7ee 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.10.0", + "version": "0.10.1", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 4075e709c..9ad270151 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.10.0", + "version": "0.10.1", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index b2144e8fd..57f29a236 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.10.0", + "version": "0.10.1", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 7efb00837..280fcf9f7 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index eb0918cd5..0f30bdb2b 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.10.0", + "version": "0.10.1", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 849e63ada..c9f8606ed 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 05a21266f..9732ac82b 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 6c615ffd2..0bceede65 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index c9a339807..2a38b2929 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 20e7f47c3..584bf963e 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index c0df51bb4..64c09792a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.10.0", + "version": "0.10.1", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 903202a3b..880acd8a8 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.10.0", + "version": "0.10.1", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From b038cba64ee72224efe0fe0f9e8f8c8fce0e3711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Ska=C5=82acki?= Date: Tue, 14 Apr 2020 17:39:21 +0200 Subject: [PATCH 066/223] =?UTF-8?q?Rewrite=20handling=20EXIF=20orientation?= =?UTF-8?q?=20=E2=80=94=20add=20tests,=20make=20it=20plugin-independent=20?= =?UTF-8?q?(#875)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Write tests for handling EXIF orientation * Slightly improve docs for a private function * Rewrite handling EXIF orientation Do not rely on .rotate() and .mirror() methods, which are defined in plugins. Instead, implement bitmap transformation functions, which then can be applied to move pixels around. This approach has two main benefits: no plugins are required, and everything happens in one pass. --- packages/core/src/utils/image-bitmap.js | 151 ++++++++++++++++++----- packages/jimp/test/exif-rotation.test.js | 24 ++++ 2 files changed, 141 insertions(+), 34 deletions(-) create mode 100644 packages/jimp/test/exif-rotation.test.js diff --git a/packages/core/src/utils/image-bitmap.js b/packages/core/src/utils/image-bitmap.js index 7b51e0214..875079e97 100644 --- a/packages/core/src/utils/image-bitmap.js +++ b/packages/core/src/utils/image-bitmap.js @@ -25,44 +25,127 @@ function getMIMEFromBuffer(buffer, path) { } /* - * Automagically rotates an image based on its EXIF data (if present) - * @param img a constants object + * Obtains image orientation from EXIF metadata. + * + * @param img {Jimp} a Jimp image object + * @returns {number} a number 1-8 representing EXIF orientation, + * in particular 1 if orientation tag is missing */ -function exifRotate(img) { - const exif = img._exif; - - if (exif && exif.tags && exif.tags.Orientation) { - switch (img._exif.tags.Orientation) { - case 1: // Horizontal (normal) - // do nothing - break; - case 2: // Mirror horizontal - img.mirror(true, false); - break; - case 3: // Rotate 180 - img.rotate(180); - break; - case 4: // Mirror vertical - img.mirror(false, true); - break; - case 5: // Mirror horizontal and rotate 270 CW - img.rotate(-90).mirror(true, false); - break; - case 6: // Rotate 90 CW - img.rotate(-90); - break; - case 7: // Mirror horizontal and rotate 90 CW - img.rotate(90).mirror(true, false); - break; - case 8: // Rotate 270 CW - img.rotate(-270); - break; - default: - break; +function getExifOrientation(img) { + return (img._exif && img._exif.tags && img._exif.tags.Orientation) || 1; +} + +/** + * Returns a function which translates EXIF-rotated coordinates into + * non-rotated ones. + * + * Transformation reference: http://sylvana.net/jpegcrop/exif_orientation.html. + * + * @param img {Jimp} a Jimp image object + * @returns {function} transformation function for transformBitmap(). + */ +function getExifOrientationTransformation(img) { + const w = img.getWidth(); + const h = img.getHeight(); + + switch (getExifOrientation(img)) { + case 1: // Horizontal (normal) + // does not need to be supported here + return null; + + case 2: // Mirror horizontal + return function(x, y) { + return [w - x - 1, y]; + }; + + case 3: // Rotate 180 + return function(x, y) { + return [w - x - 1, h - y - 1]; + }; + + case 4: // Mirror vertical + return function(x, y) { + return [x, h - y - 1]; + }; + + case 5: // Mirror horizontal and rotate 270 CW + return function(x, y) { + return [y, x]; + }; + + case 6: // Rotate 90 CW + return function(x, y) { + return [y, h - x - 1]; + }; + + case 7: // Mirror horizontal and rotate 90 CW + return function(x, y) { + return [w - y - 1, h - x - 1]; + }; + + case 8: // Rotate 270 CW + return function(x, y) { + return [w - y - 1, x]; + }; + + default: + return null; + } +} + +/* + * Transforms bitmap in place (moves pixels around) according to given + * transformation function. + * + * @param img {Jimp} a Jimp image object, which bitmap is supposed to + * be transformed + * @param width {number} bitmap width after the transformation + * @param height {number} bitmap height after the transformation + * @param transformation {function} transformation function which defines pixel + * mapping between new and source bitmap. It takes a pair of coordinates + * in the target, and returns a respective pair of coordinates in + * the source bitmap, i.e. has following form: + * `function(new_x, new_y) { return [src_x, src_y] }`. + */ +function transformBitmap(img, width, height, transformation) { + // Underscore-prefixed values are related to the source bitmap + // Their counterparts with no prefix are related to the target bitmap + const _data = img.bitmap.data; + const _width = img.bitmap.width; + + const data = Buffer.alloc(_data.length); + + for (let x = 0; x < width; x++) { + for (let y = 0; y < height; y++) { + const [_x, _y] = transformation(x, y); + + const idx = (width * y + x) << 2; + const _idx = (_width * _y + _x) << 2; + + const pixel = _data.readUInt32BE(_idx); + data.writeUInt32BE(pixel, idx); } } - return img; + img.bitmap.data = data; + img.bitmap.width = width; + img.bitmap.height = height; +} + +/* + * Automagically rotates an image based on its EXIF data (if present). + * @param img {Jimp} a Jimp image object + */ +function exifRotate(img) { + if (getExifOrientation(img) < 2) return; + + const transformation = getExifOrientationTransformation(img); + const swapDimensions = getExifOrientation(img) > 4; + + const newWidth = swapDimensions ? img.bitmap.height : img.bitmap.width; + const newHeight = swapDimensions ? img.bitmap.width : img.bitmap.height; + + transformBitmap(img, newWidth, newHeight, transformation); } // parses a bitmap from the constructor to the JIMP bitmap property diff --git a/packages/jimp/test/exif-rotation.test.js b/packages/jimp/test/exif-rotation.test.js new file mode 100644 index 000000000..83b476227 --- /dev/null +++ b/packages/jimp/test/exif-rotation.test.js @@ -0,0 +1,24 @@ +import { Jimp, getTestDir } from '@jimp/test-utils'; + +import configure from '@jimp/custom'; + +const jimp = configure({ plugins: [] }, Jimp); + +describe('EXIF orientation', () => { + for (let orientation = 1; orientation <= 8; orientation++) { + it(`is fixed when EXIF orientation is ${orientation}`, async () => { + const regularImg = await imageWithOrientation(1); + const orientedImg = await imageWithOrientation(orientation); + + orientedImg.getWidth().should.be.equal(regularImg.getWidth()); + orientedImg.getHeight().should.be.equal(regularImg.getHeight()); + Jimp.distance(regularImg, orientedImg).should.lessThan(0.07); + }); + } +}); + +function imageWithOrientation(orientation) { + const imageName = `Landscape_${orientation}.jpg`; + const path = getTestDir(__dirname) + '/images/exif-orientation/' + imageName; + return jimp.read(path); +} From baf756c6032e38fd4fa44c31dcbb5fdbaaa97af1 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 14 Apr 2020 15:46:27 +0000 Subject: [PATCH 067/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ packages/core/CHANGELOG.md | 12 ++++++++++++ packages/jimp/CHANGELOG.md | 12 ++++++++++++ 3 files changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d3128faa..03b89b55e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.10.2 (Tue Apr 14 2020) + +#### 🐛 Bug Fix + +- `@jimp/core`, `jimp` + - Rewrite handling EXIF orientation — add tests, make it plugin-independent [#875](https://github.com/oliver-moran/jimp/pull/875) ([@skalee](https://github.com/skalee)) + +#### Authors: 1 + +- Sebastian Skałacki ([@skalee](https://github.com/skalee)) + +--- + # v0.10.1 (Sun Apr 05 2020) #### 🐛 Bug Fix diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 38e45c387..13c526603 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.2 (Tue Apr 14 2020) + +#### 🐛 Bug Fix + +- Rewrite handling EXIF orientation — add tests, make it plugin-independent [#875](https://github.com/oliver-moran/jimp/pull/875) ([@skalee](https://github.com/skalee)) + +#### Authors: 1 + +- Sebastian Skałacki ([@skalee](https://github.com/skalee)) + +--- + # v0.10.0 (Mon Mar 30 2020) #### 🚀 Enhancement diff --git a/packages/jimp/CHANGELOG.md b/packages/jimp/CHANGELOG.md index 96ca4370c..80fc7de34 100644 --- a/packages/jimp/CHANGELOG.md +++ b/packages/jimp/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.2 (Tue Apr 14 2020) + +#### 🐛 Bug Fix + +- Rewrite handling EXIF orientation — add tests, make it plugin-independent [#875](https://github.com/oliver-moran/jimp/pull/875) ([@skalee](https://github.com/skalee)) + +#### Authors: 1 + +- Sebastian Skałacki ([@skalee](https://github.com/skalee)) + +--- + # v0.10.0 (Mon Mar 30 2020) #### 🚀 Enhancement From dd7a6ba5d374d273d8ef69a1832725f6c768f817 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 14 Apr 2020 15:46:28 +0000 Subject: [PATCH 068/223] Bump version to: v0.10.2 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index f2049daed..fbab8b1a1 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.10.1" + "version": "0.10.2" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 9bc26f2d5..26eefccde 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.10.1", + "version": "0.10.2", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.10.1", + "jimp": "^0.10.2", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 446d35da6..bfe1a7c84 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.10.1", + "version": "0.10.2", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index 0923b421b..b87abbaa5 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.10.1", + "version": "0.10.2", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 4f1a76641..45b05613d 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.10.1", + "version": "0.10.2", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 728216c23..bd18d5526 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.10.1", + "version": "0.10.2", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index ac6b221d5..9bfcf977d 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.10.1", + "version": "0.10.2", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index fa5156cd2..4c3baee2f 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.10.1", + "version": "0.10.2", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 2e41c14a0..6907e8cde 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.10.1", + "version": "0.10.2", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 752a27c89..1e24d872c 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.10.1", + "version": "0.10.2", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 08fe36c59..197349b00 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.10.1", + "version": "0.10.2", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 78b8a5739..9434b3e6e 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.10.1", + "version": "0.10.2", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 5986432a1..e2ccf4851 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.10.1", + "version": "0.10.2", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index cdc8ef273..6fbf57717 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.10.1", + "version": "0.10.2", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index db3e0c210..03c906956 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.10.1", + "version": "0.10.2", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 28536c122..ff91e1af0 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.10.1", + "version": "0.10.2", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 659a1f0f3..687d1a797 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.10.1", + "version": "0.10.2", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 965f409b6..7ccedc028 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.10.1", + "version": "0.10.2", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 394d23a32..5ac3f4c46 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.10.1", + "version": "0.10.2", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index aab6d290c..c1c77d923 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.10.1", + "version": "0.10.2", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index af2f9d832..79800d5ac 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.10.1", + "version": "0.10.2", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 360b31dc4..0f084321d 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.10.1", + "version": "0.10.2", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 1abc3b3aa..bbccc2b15 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.10.1", + "version": "0.10.2", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 0ae02b7ee..0e2a0dbcd 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.10.1", + "version": "0.10.2", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 9ad270151..a941056d0 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.10.1", + "version": "0.10.2", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 57f29a236..1b98a1dcb 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.10.1", + "version": "0.10.2", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 280fcf9f7..f9f22f12c 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 0f30bdb2b..1a6d7c75a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.10.1", + "version": "0.10.2", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index c9f8606ed..72abb2a6e 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 9732ac82b..02413b3bd 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 0bceede65..66646f970 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 2a38b2929..a3dfb5d4f 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 584bf963e..a434bb22b 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 64c09792a..f0ace13a4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.10.1", + "version": "0.10.2", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 880acd8a8..54b165e9a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.10.1", + "version": "0.10.2", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From e93497acb2d9d53134d322e856127888161c9a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Ska=C5=82acki?= Date: Mon, 20 Apr 2020 21:53:42 +0200 Subject: [PATCH 069/223] Simplify and fix flip (#879) * Write missing tests for the Flip plugin * Remove broken code branch in Flip plugin Removing this unnecessary "shortcut": - Has no bad effect on complexity - Removes dependency on Rotate plugin - Fixes #829 - Actually shortens and simplifies the implementation --- packages/plugin-flip/src/index.js | 5 -- packages/plugin-flip/test/flipping.test.js | 99 ++++++++++++++++++++++ 2 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 packages/plugin-flip/test/flipping.test.js diff --git a/packages/plugin-flip/src/index.js b/packages/plugin-flip/src/index.js index 0b0ba5041..212fb8482 100644 --- a/packages/plugin-flip/src/index.js +++ b/packages/plugin-flip/src/index.js @@ -15,11 +15,6 @@ function flipFn(horizontal, vertical, cb) { cb ); - if (horizontal && vertical) { - // shortcut - return this.rotate(180, true, cb); - } - const bitmap = Buffer.alloc(this.bitmap.data.length); this.scanQuiet(0, 0, this.bitmap.width, this.bitmap.height, function( x, diff --git a/packages/plugin-flip/test/flipping.test.js b/packages/plugin-flip/test/flipping.test.js new file mode 100644 index 000000000..de9a1e49a --- /dev/null +++ b/packages/plugin-flip/test/flipping.test.js @@ -0,0 +1,99 @@ +import { Jimp, mkJGD } from '@jimp/test-utils'; + +import configure from '@jimp/custom'; + +import flip from '../src'; + +const jimp = configure({ plugins: [flip] }, Jimp); + +describe('Flipping plugin', () => { + it('can flip horizontally', async () => { + const src = await jimp.read( + mkJGD( + 'AAAABBBB', + 'AAABAAAB', + 'ABABABAB', + 'CCCCCCCC', + 'CCCCCCCC', + 'CCCCCCCC', + 'AACCCCAA' + ) + ); + + const result = src.flip(true, false); + + result + .getJGDSync() + .should.be.sameJGD( + mkJGD( + 'BBBBAAAA', + 'BAAABAAA', + 'BABABABA', + 'CCCCCCCC', + 'CCCCCCCC', + 'CCCCCCCC', + 'AACCCCAA' + ) + ); + }); + + it('can flip vertically', async () => { + const src = await jimp.read( + mkJGD( + 'AAAABBBB', + 'AAABAAAB', + 'ABABABAB', + 'CCCCCCCC', + 'CCCCCCCC', + 'CCCCCCCC', + 'AACCCCAA' + ) + ); + + const result = src.flip(false, true); + + result + .getJGDSync() + .should.be.sameJGD( + mkJGD( + 'AACCCCAA', + 'CCCCCCCC', + 'CCCCCCCC', + 'CCCCCCCC', + 'ABABABAB', + 'AAABAAAB', + 'AAAABBBB' + ) + ); + }); + + it('can flip both horizontally and vertically at once', async () => { + const src = await jimp.read( + mkJGD( + 'AAAABBBB', + 'AAABAAAB', + 'ABABABAB', + 'CCCCCCCC', + 'CCCCCCCC', + 'CCCCCCCC', + 'AACCCCAA' + ) + ); + + const result = src.flip(true, true); + + result + .getJGDSync() + .should.be.sameJGD( + mkJGD( + 'AACCCCAA', + 'CCCCCCCC', + 'CCCCCCCC', + 'CCCCCCCC', + 'BABABABA', + 'BAAABAAA', + 'BBBBAAAA' + ) + ); + }); +}); From 30f04f7a8a844279a836539b434aa72e2e8774ba Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Mon, 20 Apr 2020 20:00:52 +0000 Subject: [PATCH 070/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ packages/plugin-flip/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b89b55e..76aa855c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.10.3 (Mon Apr 20 2020) + +#### 🐛 Bug Fix + +- `@jimp/plugin-flip` + - Simplify and fix flip [#879](https://github.com/oliver-moran/jimp/pull/879) ([@skalee](https://github.com/skalee)) + +#### Authors: 1 + +- Sebastian Skałacki ([@skalee](https://github.com/skalee)) + +--- + # v0.10.2 (Tue Apr 14 2020) #### 🐛 Bug Fix diff --git a/packages/plugin-flip/CHANGELOG.md b/packages/plugin-flip/CHANGELOG.md index 36ecda1a0..067e8bced 100644 --- a/packages/plugin-flip/CHANGELOG.md +++ b/packages/plugin-flip/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.10.3 (Mon Apr 20 2020) + +#### 🐛 Bug Fix + +- Simplify and fix flip [#879](https://github.com/oliver-moran/jimp/pull/879) ([@skalee](https://github.com/skalee)) + +#### Authors: 1 + +- Sebastian Skałacki ([@skalee](https://github.com/skalee)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix From 37197106eae5c26231018dfdc0254422f6b43927 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Mon, 20 Apr 2020 20:00:53 +0000 Subject: [PATCH 071/223] Bump version to: v0.10.3 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index fbab8b1a1..72964f3b1 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.10.2" + "version": "0.10.3" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 26eefccde..45b15b106 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.10.2", + "version": "0.10.3", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.10.2", + "jimp": "^0.10.3", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index bfe1a7c84..1d3f458f8 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.10.2", + "version": "0.10.3", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index b87abbaa5..6b282b240 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.10.2", + "version": "0.10.3", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 45b05613d..7c18b1d97 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.10.2", + "version": "0.10.3", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index bd18d5526..817fc3bc0 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.10.2", + "version": "0.10.3", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 9bfcf977d..49b73e1ba 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.10.2", + "version": "0.10.3", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 4c3baee2f..b28cabbf1 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.10.2", + "version": "0.10.3", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 6907e8cde..871097bec 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.10.2", + "version": "0.10.3", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 1e24d872c..b93fe53e0 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.10.2", + "version": "0.10.3", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 197349b00..166550c37 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.10.2", + "version": "0.10.3", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 9434b3e6e..1abcdbe58 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.10.2", + "version": "0.10.3", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index e2ccf4851..0e6ca1ce2 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.10.2", + "version": "0.10.3", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 6fbf57717..ad6bb0122 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.10.2", + "version": "0.10.3", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 03c906956..546d9d080 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.10.2", + "version": "0.10.3", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index ff91e1af0..6c2ac7b2a 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.10.2", + "version": "0.10.3", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 687d1a797..06477e952 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.10.2", + "version": "0.10.3", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 7ccedc028..6bcb73f90 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.10.2", + "version": "0.10.3", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 5ac3f4c46..9788613b5 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.10.2", + "version": "0.10.3", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index c1c77d923..5aaa9474a 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.10.2", + "version": "0.10.3", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 79800d5ac..d1cc73f2a 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.10.2", + "version": "0.10.3", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 0f084321d..928ef1a05 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.10.2", + "version": "0.10.3", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index bbccc2b15..f8d2238b7 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.10.2", + "version": "0.10.3", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 0e2a0dbcd..4ac70bc10 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.10.2", + "version": "0.10.3", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index a941056d0..3519dec71 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.10.2", + "version": "0.10.3", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 1b98a1dcb..84e1d2f36 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.10.2", + "version": "0.10.3", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index f9f22f12c..7473ed013 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 1a6d7c75a..8dc097f83 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.10.2", + "version": "0.10.3", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 72abb2a6e..c6daacef5 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 02413b3bd..a476eedde 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 66646f970..8a1ce5afb 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index a3dfb5d4f..e9ac717c0 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index a434bb22b..d2308352d 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index f0ace13a4..13ee04746 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.10.2", + "version": "0.10.3", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 54b165e9a..bc5f273dc 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.10.2", + "version": "0.10.3", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 585c1aba7ef2967eb948486b047ba766d761d9f0 Mon Sep 17 00:00:00 2001 From: Eric Rabil Date: Fri, 1 May 2020 23:57:55 -0400 Subject: [PATCH 072/223] Removed Core-JS as a dependency. (#882) * Removed Core-JS as a dependency. * Noted removal of core-js * v0.10.4 --- README.md | 6 +- lerna.json | 2 +- packages/cli/package.json | 4 +- packages/core/package.json | 3 +- packages/custom/package.json | 5 +- packages/jimp/package.json | 3 +- packages/plugin-blit/package.json | 5 +- packages/plugin-blur/package.json | 5 +- packages/plugin-circle/package.json | 5 +- packages/plugin-color/package.json | 3 +- packages/plugin-contain/package.json | 5 +- packages/plugin-cover/package.json | 5 +- packages/plugin-crop/package.json | 5 +- packages/plugin-displace/package.json | 5 +- packages/plugin-dither/package.json | 5 +- packages/plugin-fisheye/package.json | 5 +- packages/plugin-flip/package.json | 5 +- packages/plugin-gaussian/package.json | 5 +- packages/plugin-invert/package.json | 5 +- packages/plugin-mask/package.json | 5 +- packages/plugin-normalize/package.json | 5 +- packages/plugin-print/package.json | 3 +- packages/plugin-resize/package.json | 5 +- packages/plugin-rotate/package.json | 5 +- packages/plugin-scale/package.json | 5 +- packages/plugin-shadow/package.json | 5 +- packages/plugin-threshold/package.json | 5 +- packages/plugins/package.json | 3 +- packages/test-utils/package.json | 3 +- packages/type-bmp/package.json | 5 +- packages/type-gif/package.json | 3 +- packages/type-jpeg/package.json | 3 +- packages/type-png/package.json | 3 +- packages/type-tiff/package.json | 3 +- packages/types/package.json | 3 +- packages/utils/package.json | 3 +- yarn.lock | 118 ++++++++++++------------- 37 files changed, 119 insertions(+), 152 deletions(-) diff --git a/README.md b/README.md index b78545384..a2b918298 100755 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ Installation: `npm install --save jimp` API documentation can be found in the main [jimp package](./packages/jimp) +> ## Notice of potentially breaking change +> +> As of v0.10.4, core-js is no longer included with jimp or its extensions. If you rely on core-js, install it with either `yarn add core-js` or `npm i core-js` + ## Tools :hammer: [cli](./packages/cli) - Jimp as a CLI program. Can load and run all plugins @@ -70,7 +74,7 @@ Jimp is licensed under the MIT license. Open Sans is licensed under the Apache l ## Project Using Jimp -:star: [nimp](https://nimp.app/) - Node based image manipulator. Procedurally create and edit images. +:star: [nimp](https://nimp.app/) - Node based image manipulator. Procedurally create and edit images. :star: [favicons](https://www.npmjs.com/package/favicons) - A Node.js module for generating favicons and their associated files. diff --git a/lerna.json b/lerna.json index 72964f3b1..0c2e4d3a6 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.10.3" + "version": "0.10.4" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 45b15b106..a267a4a3d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.10.3", + "version": "0.10.4", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.10.3", + "jimp": "^0.10.4", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 1d3f458f8..3ed9dabe4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.10.3", + "version": "0.10.4", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", @@ -38,7 +38,6 @@ "@jimp/utils": "link:../utils", "any-base": "^1.1.0", "buffer": "^5.2.0", - "core-js": "^3.4.1", "exif-parser": "^0.1.12", "file-type": "^9.0.0", "load-bmfont": "^1.3.1", diff --git a/packages/custom/package.json b/packages/custom/package.json index 6b282b240..bbcbd8d91 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.10.3", + "version": "0.10.4", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/core": "link:../core", - "core-js": "^3.4.1" + "@jimp/core": "link:../core" }, "publishConfig": { "access": "public" diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 7c18b1d97..58f64532d 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.10.3", + "version": "0.10.4", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", @@ -63,7 +63,6 @@ "@jimp/custom": "link:../custom", "@jimp/plugins": "link:../plugins", "@jimp/types": "link:../types", - "core-js": "^3.4.1", "regenerator-runtime": "^0.13.3" }, "devDependencies": { diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 817fc3bc0..4c4da74d4 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.10.3", + "version": "0.10.4", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "devDependencies": { "@jimp/custom": "link:../custom", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 49b73e1ba..3326b651f 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.10.3", + "version": "0.10.4", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index b28cabbf1..cd3404fd3 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.10.3", + "version": "0.10.4", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 871097bec..fe8497c34 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.10.3", + "version": "0.10.4", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", @@ -22,7 +22,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", "tinycolor2": "^1.4.1" }, "devDependencies": { diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index b93fe53e0..5ce52ec99 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.10.3", + "version": "0.10.4", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 166550c37..9a7f4b716 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.10.3", + "version": "0.10.4", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 1abcdbe58..cd17f8379 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.10.3", + "version": "0.10.4", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "devDependencies": { "@jimp/custom": "link:../custom", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 0e6ca1ce2..cd7ae8ea8 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.10.3", + "version": "0.10.4", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index ad6bb0122..d92c2721d 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.10.3", + "version": "0.10.4", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 546d9d080..0b9b8a8c9 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.10.3", + "version": "0.10.4", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 6c2ac7b2a..54623aece 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.10.3", + "version": "0.10.4", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 06477e952..96db21fa3 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.10.3", + "version": "0.10.4", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 6bcb73f90..69a1e241c 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.10.3", + "version": "0.10.4", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 9788613b5..44474f16f 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.10.3", + "version": "0.10.4", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 5aaa9474a..99a3de5b3 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.10.3", + "version": "0.10.4", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index d1cc73f2a..2061c6e5a 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.10.3", + "version": "0.10.4", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", @@ -22,7 +22,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", "load-bmfont": "^1.4.0" }, "peerDependencies": { diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 928ef1a05..98f1b3fae 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.10.3", + "version": "0.10.4", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index f8d2238b7..30b4c1e1f 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.10.3", + "version": "0.10.4", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 4ac70bc10..c244273d6 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.10.3", + "version": "0.10.4", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", @@ -18,8 +18,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 3519dec71..3dbd8ada6 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.10.3", + "version": "0.10.4", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 84e1d2f36..5f869d7ee 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.10.3", + "version": "0.10.4", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", @@ -21,8 +21,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "@jimp/utils": "link:../utils", - "core-js": "^3.4.1" + "@jimp/utils": "link:../utils" }, "peerDependencies": { "@jimp/custom": ">=0.3.5", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 7473ed013..553a3a4e4 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", @@ -39,7 +39,6 @@ "@jimp/plugin-scale": "link:../plugin-scale", "@jimp/plugin-shadow": "link:../plugin-shadow", "@jimp/plugin-threshold": "link:../plugin-threshold", - "core-js": "^3.4.1", "timm": "^1.6.1" }, "peerDependencies": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 8dc097f83..d3f67884d 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.10.3", + "version": "0.10.4", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -23,7 +23,6 @@ }, "dependencies": { "@babel/runtime": "^7.7.2", - "core-js": "^3.4.1", "pngjs": "^3.3.3" }, "devDependencies": { diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index c6daacef5..c9e3d2467 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -22,8 +22,7 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "bmp-js": "^0.1.0", - "core-js": "^3.4.1" + "bmp-js": "^0.1.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index a476eedde..5194f4b9c 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -19,7 +19,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", "omggif": "^1.0.9" }, "peerDependencies": { diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 8a1ce5afb..924a05c60 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -22,7 +22,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", "jpeg-js": "^0.3.4" }, "peerDependencies": { diff --git a/packages/type-png/package.json b/packages/type-png/package.json index e9ac717c0..4b73e1051 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -22,7 +22,6 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "core-js": "^3.4.1", "pngjs": "^3.3.3" }, "peerDependencies": { diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index d2308352d..4d4f47217 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", @@ -21,7 +21,6 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", - "core-js": "^3.4.1", "utif": "^2.0.1" }, "peerDependencies": { diff --git a/packages/types/package.json b/packages/types/package.json index 13ee04746..5cbadc281 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.10.3", + "version": "0.10.4", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", @@ -23,7 +23,6 @@ "@jimp/jpeg": "link:../type-jpeg", "@jimp/png": "link:../type-png", "@jimp/tiff": "link:../type-tiff", - "core-js": "^3.4.1", "timm": "^1.6.1" }, "peerDependencies": { diff --git a/packages/utils/package.json b/packages/utils/package.json index bc5f273dc..48bc61bcb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.10.3", + "version": "0.10.4", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", @@ -21,7 +21,6 @@ }, "dependencies": { "@babel/runtime": "^7.7.2", - "core-js": "^3.4.1", "regenerator-runtime": "^0.13.3" } } diff --git a/yarn.lock b/yarn.lock index d6fb700e5..66ef0db00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1008,21 +1008,19 @@ which "^1.3.1" "@jimp/bmp@link:packages/type-bmp": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" bmp-js "^0.1.0" - core-js "^3.4.1" "@jimp/core@link:packages/core": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" any-base "^1.1.0" buffer "^5.2.0" - core-js "^3.4.1" exif-parser "^0.1.12" file-type "^9.0.0" load-bmfont "^1.3.1" @@ -1032,161 +1030,167 @@ tinycolor2 "^1.4.1" "@jimp/custom@link:packages/custom": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/core" "link:packages/core" - core-js "^3.4.1" "@jimp/gif@link:packages/type-gif": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" omggif "^1.0.9" "@jimp/jpeg@link:packages/type-jpeg": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" jpeg-js "^0.3.4" "@jimp/plugin-blit@link:packages/plugin-blit": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-blur@link:packages/plugin-blur": - version "0.9.6" + version "0.10.3" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + +"@jimp/plugin-circle@link:packages/plugin-circle": + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-color@link:packages/plugin-color": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" tinycolor2 "^1.4.1" "@jimp/plugin-contain@link:packages/plugin-contain": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-cover@link:packages/plugin-cover": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-crop@link:packages/plugin-crop": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-displace@link:packages/plugin-displace": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-dither@link:packages/plugin-dither": - version "0.9.6" + version "0.10.3" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + +"@jimp/plugin-fisheye@link:packages/plugin-fisheye": + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-flip@link:packages/plugin-flip": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-gaussian@link:packages/plugin-gaussian": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-invert@link:packages/plugin-invert": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-mask@link:packages/plugin-mask": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-normalize@link:packages/plugin-normalize": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-print@link:packages/plugin-print": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" load-bmfont "^1.4.0" "@jimp/plugin-resize@link:packages/plugin-resize": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-rotate@link:packages/plugin-rotate": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugin-scale@link:packages/plugin-scale": - version "0.9.6" + version "0.10.3" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + +"@jimp/plugin-shadow@link:packages/plugin-shadow": + version "0.10.3" + dependencies: + "@babel/runtime" "^7.7.2" + "@jimp/utils" "link:packages/utils" + +"@jimp/plugin-threshold@link:packages/plugin-threshold": + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" "@jimp/plugins@link:packages/plugins": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/plugin-blit" "link:packages/plugin-blit" "@jimp/plugin-blur" "link:packages/plugin-blur" + "@jimp/plugin-circle" "link:packages/plugin-circle" "@jimp/plugin-color" "link:packages/plugin-color" "@jimp/plugin-contain" "link:packages/plugin-contain" "@jimp/plugin-cover" "link:packages/plugin-cover" "@jimp/plugin-crop" "link:packages/plugin-crop" "@jimp/plugin-displace" "link:packages/plugin-displace" "@jimp/plugin-dither" "link:packages/plugin-dither" + "@jimp/plugin-fisheye" "link:packages/plugin-fisheye" "@jimp/plugin-flip" "link:packages/plugin-flip" "@jimp/plugin-gaussian" "link:packages/plugin-gaussian" "@jimp/plugin-invert" "link:packages/plugin-invert" @@ -1196,33 +1200,31 @@ "@jimp/plugin-resize" "link:packages/plugin-resize" "@jimp/plugin-rotate" "link:packages/plugin-rotate" "@jimp/plugin-scale" "link:packages/plugin-scale" - core-js "^3.4.1" + "@jimp/plugin-shadow" "link:packages/plugin-shadow" + "@jimp/plugin-threshold" "link:packages/plugin-threshold" timm "^1.6.1" "@jimp/png@link:packages/type-png": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" - core-js "^3.4.1" pngjs "^3.3.3" "@jimp/test-utils@link:packages/test-utils": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" - core-js "^3.4.1" pngjs "^3.3.3" "@jimp/tiff@link:packages/type-tiff": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" - core-js "^3.4.1" utif "^2.0.1" "@jimp/types@link:packages/types": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" "@jimp/bmp" "link:packages/type-bmp" @@ -1230,14 +1232,13 @@ "@jimp/jpeg" "link:packages/type-jpeg" "@jimp/png" "link:packages/type-png" "@jimp/tiff" "link:packages/type-tiff" - core-js "^3.4.1" timm "^1.6.1" "@jimp/utils@link:packages/utils": - version "0.9.6" + version "0.10.3" dependencies: "@babel/runtime" "^7.7.2" - core-js "^3.4.1" + regenerator-runtime "^0.13.3" "@lerna/add@3.16.2": version "3.16.2" @@ -3856,11 +3857,6 @@ core-js@^3.1.3: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09" integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw== -core-js@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.4.1.tgz#76dd6828412900ab27c8ce0b22e6114d7ce21b18" - integrity sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg== - core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" From 2f996639b46247087117a09b3e2c9f3d73fab533 Mon Sep 17 00:00:00 2001 From: Han Kruiger Date: Fri, 15 May 2020 23:12:19 +0200 Subject: [PATCH 073/223] Make callback optional for Jimp.rgbaToInt (#889) --- packages/core/types/jimp.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/types/jimp.d.ts b/packages/core/types/jimp.d.ts index d82b0fa39..5d93d15ee 100644 --- a/packages/core/types/jimp.d.ts +++ b/packages/core/types/jimp.d.ts @@ -99,7 +99,7 @@ export interface JimpConstructors { g: number, b: number, a: number, - cb: GenericCallback + cb?: GenericCallback ): number; intToRGBA(i: number, cb?: GenericCallback): RGBA; cssColorToHex(cssColor: string): number; From a52b096e7df86e3ccb2a0d7ea4a010c659460656 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 15 May 2020 21:21:10 +0000 Subject: [PATCH 074/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 19 +++++++++++++++++++ packages/cli/CHANGELOG.md | 12 ++++++++++++ packages/core/CHANGELOG.md | 17 +++++++++++++++++ packages/custom/CHANGELOG.md | 12 ++++++++++++ packages/jimp/CHANGELOG.md | 12 ++++++++++++ packages/plugin-blit/CHANGELOG.md | 12 ++++++++++++ packages/plugin-blur/CHANGELOG.md | 12 ++++++++++++ packages/plugin-circle/CHANGELOG.md | 12 ++++++++++++ packages/plugin-color/CHANGELOG.md | 12 ++++++++++++ packages/plugin-contain/CHANGELOG.md | 12 ++++++++++++ packages/plugin-cover/CHANGELOG.md | 12 ++++++++++++ packages/plugin-crop/CHANGELOG.md | 12 ++++++++++++ packages/plugin-displace/CHANGELOG.md | 12 ++++++++++++ packages/plugin-dither/CHANGELOG.md | 12 ++++++++++++ packages/plugin-fisheye/CHANGELOG.md | 12 ++++++++++++ packages/plugin-flip/CHANGELOG.md | 12 ++++++++++++ packages/plugin-gaussian/CHANGELOG.md | 12 ++++++++++++ packages/plugin-invert/CHANGELOG.md | 12 ++++++++++++ packages/plugin-mask/CHANGELOG.md | 12 ++++++++++++ packages/plugin-normalize/CHANGELOG.md | 12 ++++++++++++ packages/plugin-print/CHANGELOG.md | 12 ++++++++++++ packages/plugin-resize/CHANGELOG.md | 12 ++++++++++++ packages/plugin-rotate/CHANGELOG.md | 12 ++++++++++++ packages/plugin-scale/CHANGELOG.md | 12 ++++++++++++ packages/plugin-shadow/CHANGELOG.md | 12 ++++++++++++ packages/plugin-threshold/CHANGELOG.md | 12 ++++++++++++ packages/plugins/CHANGELOG.md | 12 ++++++++++++ packages/test-utils/CHANGELOG.md | 12 ++++++++++++ packages/type-bmp/CHANGELOG.md | 12 ++++++++++++ packages/type-gif/CHANGELOG.md | 12 ++++++++++++ packages/type-jpeg/CHANGELOG.md | 12 ++++++++++++ packages/type-png/CHANGELOG.md | 12 ++++++++++++ packages/type-tiff/CHANGELOG.md | 12 ++++++++++++ packages/types/CHANGELOG.md | 12 ++++++++++++ packages/utils/CHANGELOG.md | 12 ++++++++++++ 35 files changed, 432 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76aa855c0..cfe8c917c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- `@jimp/cli`, `@jimp/core`, `@jimp/custom`, `jimp`, `@jimp/plugin-blit`, `@jimp/plugin-blur`, `@jimp/plugin-circle`, `@jimp/plugin-color`, `@jimp/plugin-contain`, `@jimp/plugin-cover`, `@jimp/plugin-crop`, `@jimp/plugin-displace`, `@jimp/plugin-dither`, `@jimp/plugin-fisheye`, `@jimp/plugin-flip`, `@jimp/plugin-gaussian`, `@jimp/plugin-invert`, `@jimp/plugin-mask`, `@jimp/plugin-normalize`, `@jimp/plugin-print`, `@jimp/plugin-resize`, `@jimp/plugin-rotate`, `@jimp/plugin-scale`, `@jimp/plugin-shadow`, `@jimp/plugin-threshold`, `@jimp/plugins`, `@jimp/test-utils`, `@jimp/bmp`, `@jimp/gif`, `@jimp/jpeg`, `@jimp/png`, `@jimp/tiff`, `@jimp/types`, `@jimp/utils` + - Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### 🐛 Bug Fix + +- `@jimp/core` + - Make callback optional for Jimp.rgbaToInt [#889](https://github.com/oliver-moran/jimp/pull/889) ([@HanKruiger](https://github.com/HanKruiger)) + +#### Authors: 2 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) +- Han Kruiger ([@HanKruiger](https://github.com/HanKruiger)) + +--- + # v0.10.3 (Mon Apr 20 2020) #### 🐛 Bug Fix diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 13c526603..753e00f88 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,3 +1,20 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### 🐛 Bug Fix + +- Make callback optional for Jimp.rgbaToInt [#889](https://github.com/oliver-moran/jimp/pull/889) ([@HanKruiger](https://github.com/HanKruiger)) + +#### Authors: 2 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) +- Han Kruiger ([@HanKruiger](https://github.com/HanKruiger)) + +--- + # v0.10.2 (Tue Apr 14 2020) #### 🐛 Bug Fix diff --git a/packages/custom/CHANGELOG.md b/packages/custom/CHANGELOG.md index 814fff8db..9997674cd 100644 --- a/packages/custom/CHANGELOG.md +++ b/packages/custom/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.10.0 (Mon Mar 30 2020) #### 🚀 Enhancement diff --git a/packages/jimp/CHANGELOG.md b/packages/jimp/CHANGELOG.md index 80fc7de34..9e1ec700d 100644 --- a/packages/jimp/CHANGELOG.md +++ b/packages/jimp/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.10.2 (Tue Apr 14 2020) #### 🐛 Bug Fix diff --git a/packages/plugin-blit/CHANGELOG.md b/packages/plugin-blit/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-blit/CHANGELOG.md +++ b/packages/plugin-blit/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-blur/CHANGELOG.md b/packages/plugin-blur/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-blur/CHANGELOG.md +++ b/packages/plugin-blur/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-circle/CHANGELOG.md b/packages/plugin-circle/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-circle/CHANGELOG.md +++ b/packages/plugin-circle/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-color/CHANGELOG.md b/packages/plugin-color/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-color/CHANGELOG.md +++ b/packages/plugin-color/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-contain/CHANGELOG.md b/packages/plugin-contain/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-contain/CHANGELOG.md +++ b/packages/plugin-contain/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-cover/CHANGELOG.md b/packages/plugin-cover/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-cover/CHANGELOG.md +++ b/packages/plugin-cover/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-crop/CHANGELOG.md b/packages/plugin-crop/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-crop/CHANGELOG.md +++ b/packages/plugin-crop/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-displace/CHANGELOG.md b/packages/plugin-displace/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-displace/CHANGELOG.md +++ b/packages/plugin-displace/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-dither/CHANGELOG.md b/packages/plugin-dither/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-dither/CHANGELOG.md +++ b/packages/plugin-dither/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-fisheye/CHANGELOG.md b/packages/plugin-fisheye/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-fisheye/CHANGELOG.md +++ b/packages/plugin-fisheye/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-flip/CHANGELOG.md b/packages/plugin-flip/CHANGELOG.md index 067e8bced..8e115c856 100644 --- a/packages/plugin-flip/CHANGELOG.md +++ b/packages/plugin-flip/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.10.3 (Mon Apr 20 2020) #### 🐛 Bug Fix diff --git a/packages/plugin-gaussian/CHANGELOG.md b/packages/plugin-gaussian/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-gaussian/CHANGELOG.md +++ b/packages/plugin-gaussian/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-invert/CHANGELOG.md b/packages/plugin-invert/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-invert/CHANGELOG.md +++ b/packages/plugin-invert/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-mask/CHANGELOG.md b/packages/plugin-mask/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-mask/CHANGELOG.md +++ b/packages/plugin-mask/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-normalize/CHANGELOG.md b/packages/plugin-normalize/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-normalize/CHANGELOG.md +++ b/packages/plugin-normalize/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-print/CHANGELOG.md b/packages/plugin-print/CHANGELOG.md index 60779ac95..8db973149 100644 --- a/packages/plugin-print/CHANGELOG.md +++ b/packages/plugin-print/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.10.1 (Sun Apr 05 2020) #### 📝 Documentation diff --git a/packages/plugin-resize/CHANGELOG.md b/packages/plugin-resize/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-resize/CHANGELOG.md +++ b/packages/plugin-resize/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-rotate/CHANGELOG.md b/packages/plugin-rotate/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-rotate/CHANGELOG.md +++ b/packages/plugin-rotate/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-scale/CHANGELOG.md b/packages/plugin-scale/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/plugin-scale/CHANGELOG.md +++ b/packages/plugin-scale/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/plugin-shadow/CHANGELOG.md b/packages/plugin-shadow/CHANGELOG.md index 0e3ef1f9a..4642075dd 100644 --- a/packages/plugin-shadow/CHANGELOG.md +++ b/packages/plugin-shadow/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.4 (Tue Mar 03 2020) #### 🐛 Bug Fix diff --git a/packages/plugin-threshold/CHANGELOG.md b/packages/plugin-threshold/CHANGELOG.md index e6eb403e5..7cd6c3ac5 100644 --- a/packages/plugin-threshold/CHANGELOG.md +++ b/packages/plugin-threshold/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.7 (Fri Mar 27 2020) #### 🐛 Bug Fix diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md index a672e5a47..09abcd9ee 100644 --- a/packages/plugins/CHANGELOG.md +++ b/packages/plugins/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.8 (Sat Mar 28 2020) #### 🐛 Bug Fix diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/test-utils/CHANGELOG.md +++ b/packages/test-utils/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/type-bmp/CHANGELOG.md b/packages/type-bmp/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/type-bmp/CHANGELOG.md +++ b/packages/type-bmp/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/type-gif/CHANGELOG.md b/packages/type-gif/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/type-gif/CHANGELOG.md +++ b/packages/type-gif/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/type-jpeg/CHANGELOG.md b/packages/type-jpeg/CHANGELOG.md index 96e18f3d5..447a5c4fa 100644 --- a/packages/type-jpeg/CHANGELOG.md +++ b/packages/type-jpeg/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.10.0 (Mon Mar 30 2020) #### 🚀 Enhancement diff --git a/packages/type-png/CHANGELOG.md b/packages/type-png/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/type-png/CHANGELOG.md +++ b/packages/type-png/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/type-tiff/CHANGELOG.md b/packages/type-tiff/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/type-tiff/CHANGELOG.md +++ b/packages/type-tiff/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 36ecda1a0..26394e0ff 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.9.3 (Tue Nov 26 2019) #### 🐛 Bug Fix diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 3ecb2b57e..5ba048908 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.11.0 (Fri May 15 2020) + +#### 🚀 Enhancement + +- Removed Core-JS as a dependency. [#882](https://github.com/oliver-moran/jimp/pull/882) ([@EricRabil](https://github.com/EricRabil)) + +#### Authors: 1 + +- Eric Rabil ([@EricRabil](https://github.com/EricRabil)) + +--- + # v0.10.1 (Sun Apr 05 2020) #### 🐛 Bug Fix From ec736c9fb6aaf2b325db76819af4c3caea1f9ec8 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 15 May 2020 21:21:12 +0000 Subject: [PATCH 075/223] Bump version to: v0.11.0 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 0c2e4d3a6..3075cfbf1 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.10.4" + "version": "0.11.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index a267a4a3d..8b24c119b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.10.4", + "version": "0.11.0", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.10.4", + "jimp": "^0.11.0", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 3ed9dabe4..cdd7106b1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.10.4", + "version": "0.11.0", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index bbcbd8d91..c67c499d5 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.10.4", + "version": "0.11.0", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 58f64532d..f4426c2ca 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.10.4", + "version": "0.11.0", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 4c4da74d4..7fc14bd2a 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.10.4", + "version": "0.11.0", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 3326b651f..6781ddf1e 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.10.4", + "version": "0.11.0", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index cd3404fd3..669dd9b27 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.10.4", + "version": "0.11.0", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index fe8497c34..381a9da69 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.10.4", + "version": "0.11.0", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 5ce52ec99..04f603206 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.10.4", + "version": "0.11.0", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 9a7f4b716..82b319c4b 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.10.4", + "version": "0.11.0", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index cd17f8379..e94b26051 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.10.4", + "version": "0.11.0", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index cd7ae8ea8..62d27b3cb 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.10.4", + "version": "0.11.0", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index d92c2721d..531204d55 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.10.4", + "version": "0.11.0", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 0b9b8a8c9..9dc8257f6 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.10.4", + "version": "0.11.0", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 54623aece..b846ec9a3 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.10.4", + "version": "0.11.0", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 96db21fa3..0db4be40b 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.10.4", + "version": "0.11.0", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 69a1e241c..5c8850457 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.10.4", + "version": "0.11.0", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index 44474f16f..ec7b0e755 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.10.4", + "version": "0.11.0", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 99a3de5b3..38d024888 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.10.4", + "version": "0.11.0", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 2061c6e5a..fa8609a67 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.10.4", + "version": "0.11.0", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 98f1b3fae..c7caf818b 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.10.4", + "version": "0.11.0", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 30b4c1e1f..016911fef 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.10.4", + "version": "0.11.0", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index c244273d6..6e3562161 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.10.4", + "version": "0.11.0", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 3dbd8ada6..1a3297f73 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.10.4", + "version": "0.11.0", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 5f869d7ee..0f431f56e 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.10.4", + "version": "0.11.0", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 553a3a4e4..ea1b58615 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index d3f67884d..82d459b40 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.10.4", + "version": "0.11.0", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index c9e3d2467..20a2f4420 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 5194f4b9c..b73a07cb9 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 924a05c60..a2b4fe2f8 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 4b73e1051..b7865e8c4 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 4d4f47217..e0bb56c57 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 5cbadc281..e2608d3c0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.10.4", + "version": "0.11.0", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 48bc61bcb..f8f9a98e0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.10.4", + "version": "0.11.0", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 697f2a633b3622b51e60ca85a2d5f13fe8eec4e8 Mon Sep 17 00:00:00 2001 From: Daniel Tschinder Date: Sun, 17 May 2020 02:09:21 +0200 Subject: [PATCH 076/223] Remove compiling polyfills into published code (#891) * fix: Remove compiling polyfills into published code * Update config.yml Co-authored-by: Andrew Lisowski --- .circleci/config.yml | 21 --------------------- babel.config.js | 8 +------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e50397782..66fc3377c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,22 +44,6 @@ jobs: name: Test Types command: yarn tsTest:custom && yarn tsTest:main - build-node6.14: - working_directory: ~/jimp-6.14 - docker: - - image: circleci/node:6.14-browsers - steps: - - checkout - - run: - name: Install Dependencies - command: yarn install --frozen-lockfile --network-timeout 100000 --ignore-engines - - run: - name: Build Packages - command: yarn build - - run: - name: Test - command: yarn test --ci - build-node8: <<: *defaults steps: @@ -118,11 +102,6 @@ workflows: requires: - install - - build-node6.14: - requires: - - lint - - test-types - - build-node8: requires: - lint diff --git a/babel.config.js b/babel.config.js index 21e8be725..58347fdbe 100644 --- a/babel.config.js +++ b/babel.config.js @@ -3,13 +3,7 @@ module.exports = api => { return { presets: [ - [ - '@babel/preset-env', - { - useBuiltIns: 'usage', - corejs: 3 - } - ] + '@babel/preset-env', ], plugins: [ From a2b44a1ccde5904bc1d3dda6fe1497615b3befbf Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sat, 16 May 2020 17:14:18 -0700 Subject: [PATCH 077/223] Add readme description --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index db3afd0c0..f0a9b844b 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "workspaces": [ "packages/*" ], + "description", "The jimp monorepo.", "repository": "oliver-moran/jimp", "author": "Andrew Lisowski ", "publishConfig": { From 651de24e91b80f80afdcbaa7f76d1d4c0cbec3c2 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sat, 16 May 2020 17:16:32 -0700 Subject: [PATCH 078/223] Fix package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0a9b844b..46dc130e1 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "workspaces": [ "packages/*" ], - "description", "The jimp monorepo.", + "description": "The jimp monorepo.", "repository": "oliver-moran/jimp", "author": "Andrew Lisowski ", "publishConfig": { From 0bd02d591f873a44662a02f2bfc48a84ae90572c Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sun, 17 May 2020 00:34:05 +0000 Subject: [PATCH 079/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe8c917c..5b66d966d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +# v0.12.0 (Sun May 17 2020) + +### Release Notes + +_From #891_ + +This also drops support for node 6.14. + +--- + +#### 🚀 Enhancement + +- Remove compiling polyfills into published code [#891](https://github.com/oliver-moran/jimp/pull/891) ([@danez](https://github.com/danez) [@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### ⚠️ Pushed to `master` + +- Fix package.json ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Add readme description ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 2 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) +- Daniel Tschinder ([@danez](https://github.com/danez)) + +--- + # v0.11.0 (Fri May 15 2020) #### 🚀 Enhancement From 2b3413a12995f7f3fdfb9dfd19ba9268734c6400 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Sun, 17 May 2020 00:34:06 +0000 Subject: [PATCH 080/223] Bump version to: v0.12.0 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 3075cfbf1..91a818d44 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.11.0" + "version": "0.12.0" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 8b24c119b..e8e8b7e3b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.11.0", + "version": "0.12.0", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.11.0", + "jimp": "^0.12.0", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index cdd7106b1..c80d14ef1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.11.0", + "version": "0.12.0", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index c67c499d5..fa9c4b5e1 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.11.0", + "version": "0.12.0", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index f4426c2ca..83151c932 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.11.0", + "version": "0.12.0", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 7fc14bd2a..62c3faf5b 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.11.0", + "version": "0.12.0", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 6781ddf1e..8941722d7 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.11.0", + "version": "0.12.0", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 669dd9b27..66b25a306 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.11.0", + "version": "0.12.0", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 381a9da69..b2cdbcc0c 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.11.0", + "version": "0.12.0", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 04f603206..271cf7ee6 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.11.0", + "version": "0.12.0", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 82b319c4b..2ff342ccf 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.11.0", + "version": "0.12.0", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index e94b26051..69541f526 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.11.0", + "version": "0.12.0", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index 62d27b3cb..e17a2bfdc 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.11.0", + "version": "0.12.0", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 531204d55..1233cf568 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.11.0", + "version": "0.12.0", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 9dc8257f6..61737ca1d 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.11.0", + "version": "0.12.0", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index b846ec9a3..5e1cbba3a 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.11.0", + "version": "0.12.0", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 0db4be40b..84d137a28 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.11.0", + "version": "0.12.0", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 5c8850457..469e2e17d 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.11.0", + "version": "0.12.0", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index ec7b0e755..c1be199d6 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.11.0", + "version": "0.12.0", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 38d024888..f3b80c511 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.11.0", + "version": "0.12.0", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index fa8609a67..b2456f123 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.11.0", + "version": "0.12.0", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index c7caf818b..46547d7c1 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.11.0", + "version": "0.12.0", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 016911fef..0ceeb35e5 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.11.0", + "version": "0.12.0", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index 6e3562161..d802057e7 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.11.0", + "version": "0.12.0", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 1a3297f73..23b65ab71 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.11.0", + "version": "0.12.0", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index 0f431f56e..d8182de94 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.11.0", + "version": "0.12.0", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index ea1b58615..ce70c1852 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 82d459b40..bc9fe96be 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.11.0", + "version": "0.12.0", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index 20a2f4420..fe55f06a2 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index b73a07cb9..5cd49700e 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index a2b4fe2f8..655998f7a 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index b7865e8c4..15991d670 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index e0bb56c57..26207680f 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index e2608d3c0..a9ba14533 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.11.0", + "version": "0.12.0", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index f8f9a98e0..0b8acc6f3 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.11.0", + "version": "0.12.0", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From eacdec854bae2352a34e20fe6367f321e8b528a5 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Mon, 18 May 2020 23:21:24 -0700 Subject: [PATCH 081/223] update jpeg-js (#892) --- packages/type-jpeg/package.json | 2 +- yarn.lock | 69 ++++++++++++++++++--------------- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 655998f7a..b19518747 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -22,7 +22,7 @@ "dependencies": { "@babel/runtime": "^7.7.2", "@jimp/utils": "link:../utils", - "jpeg-js": "^0.3.4" + "jpeg-js": "^0.4.0" }, "peerDependencies": { "@jimp/custom": ">=0.3.5" diff --git a/yarn.lock b/yarn.lock index 66ef0db00..f55bfa5cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1008,14 +1008,14 @@ which "^1.3.1" "@jimp/bmp@link:packages/type-bmp": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" bmp-js "^0.1.0" "@jimp/core@link:packages/core": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" @@ -1030,155 +1030,155 @@ tinycolor2 "^1.4.1" "@jimp/custom@link:packages/custom": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/core" "link:packages/core" "@jimp/gif@link:packages/type-gif": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" omggif "^1.0.9" "@jimp/jpeg@link:packages/type-jpeg": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" jpeg-js "^0.3.4" "@jimp/plugin-blit@link:packages/plugin-blit": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-blur@link:packages/plugin-blur": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-circle@link:packages/plugin-circle": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-color@link:packages/plugin-color": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" tinycolor2 "^1.4.1" "@jimp/plugin-contain@link:packages/plugin-contain": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-cover@link:packages/plugin-cover": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-crop@link:packages/plugin-crop": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-displace@link:packages/plugin-displace": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-dither@link:packages/plugin-dither": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-fisheye@link:packages/plugin-fisheye": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-flip@link:packages/plugin-flip": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-gaussian@link:packages/plugin-gaussian": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-invert@link:packages/plugin-invert": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-mask@link:packages/plugin-mask": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-normalize@link:packages/plugin-normalize": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-print@link:packages/plugin-print": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" load-bmfont "^1.4.0" "@jimp/plugin-resize@link:packages/plugin-resize": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-rotate@link:packages/plugin-rotate": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-scale@link:packages/plugin-scale": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-shadow@link:packages/plugin-shadow": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugin-threshold@link:packages/plugin-threshold": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" "@jimp/plugins@link:packages/plugins": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/plugin-blit" "link:packages/plugin-blit" @@ -1205,26 +1205,26 @@ timm "^1.6.1" "@jimp/png@link:packages/type-png": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/utils" "link:packages/utils" pngjs "^3.3.3" "@jimp/test-utils@link:packages/test-utils": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" pngjs "^3.3.3" "@jimp/tiff@link:packages/type-tiff": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" utif "^2.0.1" "@jimp/types@link:packages/types": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" "@jimp/bmp" "link:packages/type-bmp" @@ -1235,7 +1235,7 @@ timm "^1.6.1" "@jimp/utils@link:packages/utils": - version "0.10.3" + version "0.12.0" dependencies: "@babel/runtime" "^7.7.2" regenerator-runtime "^0.13.3" @@ -6815,6 +6815,11 @@ jpeg-js@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.4.tgz#dc2ba501ee3d58b7bb893c5d1fab47294917e7e7" +jpeg-js@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.0.tgz#39adab7245b6d11e918ba5d4b49263ff2fc6a2f9" + integrity sha512-960VHmtN1vTpasX/1LupLohdP5odwAT7oK/VSm6mW0M58LbrBnowLAPWAZhWGhDAGjzbMnPXZxzB/QYgBwkN0w== + js-levenshtein@^1.1.3: version "1.1.6" resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" From f0988f77ddac75903644fd907e46ab2f7fdb85af Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 19 May 2020 06:30:14 +0000 Subject: [PATCH 082/223] Update CHANGELOG.md [skip ci] --- CHANGELOG.md | 13 +++++++++++++ packages/type-jpeg/CHANGELOG.md | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b66d966d..d3fc4c75a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# v0.12.1 (Tue May 19 2020) + +#### 🐛 Bug Fix + +- `@jimp/jpeg` + - update jpeg-js [#892](https://github.com/oliver-moran/jimp/pull/892) ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 1 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +--- + # v0.12.0 (Sun May 17 2020) ### Release Notes diff --git a/packages/type-jpeg/CHANGELOG.md b/packages/type-jpeg/CHANGELOG.md index 447a5c4fa..92630387d 100644 --- a/packages/type-jpeg/CHANGELOG.md +++ b/packages/type-jpeg/CHANGELOG.md @@ -1,3 +1,15 @@ +# v0.12.1 (Tue May 19 2020) + +#### 🐛 Bug Fix + +- update jpeg-js [#892](https://github.com/oliver-moran/jimp/pull/892) ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +#### Authors: 1 + +- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie)) + +--- + # v0.11.0 (Fri May 15 2020) #### 🚀 Enhancement From 942e635564e36fc243767531b4f8be036afa40b5 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Tue, 19 May 2020 06:30:16 +0000 Subject: [PATCH 083/223] Bump version to: v0.12.1 [skip ci] --- lerna.json | 2 +- packages/cli/package.json | 4 ++-- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/package.json | 2 +- packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-circle/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 2 +- packages/plugin-cover/package.json | 2 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-fisheye/package.json | 2 +- packages/plugin-flip/package.json | 2 +- packages/plugin-gaussian/package.json | 2 +- packages/plugin-invert/package.json | 2 +- packages/plugin-mask/package.json | 2 +- packages/plugin-normalize/package.json | 2 +- packages/plugin-print/package.json | 2 +- packages/plugin-resize/package.json | 2 +- packages/plugin-rotate/package.json | 2 +- packages/plugin-scale/package.json | 2 +- packages/plugin-shadow/package.json | 2 +- packages/plugin-threshold/package.json | 2 +- packages/plugins/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- packages/type-tiff/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- 35 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 91a818d44..dcf3db58d 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "registry": "https://registry.npmjs.org/", "useWorkspaces": true, - "version": "0.12.0" + "version": "0.12.1" } diff --git a/packages/cli/package.json b/packages/cli/package.json index e8e8b7e3b..d5c9f42ed 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/cli", - "version": "0.12.0", + "version": "0.12.1", "description": "jimp on the cli", "bin": { "jimp": "dist/index.js" @@ -19,7 +19,7 @@ "dependencies": { "@jimp/custom": "link:../custom", "chalk": "^2.4.1", - "jimp": "^0.12.0", + "jimp": "^0.12.1", "log-symbols": "^2.2.0", "yargs": "^12.0.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index c80d14ef1..f0694f5b1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/core", - "version": "0.12.0", + "version": "0.12.1", "description": "Jimp core", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/custom/package.json b/packages/custom/package.json index fa9c4b5e1..9a5e96e99 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/custom", - "version": "0.12.0", + "version": "0.12.1", "description": "Interface to customize jimp configuration", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 83151c932..43cb21d7d 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -1,6 +1,6 @@ { "name": "jimp", - "version": "0.12.0", + "version": "0.12.1", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies)", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 62c3faf5b..d87b5d799 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blit", - "version": "0.12.0", + "version": "0.12.1", "description": "Blit an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 8941722d7..7aa3e092b 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-blur", - "version": "0.12.0", + "version": "0.12.1", "description": "blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json index 66b25a306..9a0c33e85 100644 --- a/packages/plugin-circle/package.json +++ b/packages/plugin-circle/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-circle", - "version": "0.12.0", + "version": "0.12.1", "description": "Creates a circle out of an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index b2cdbcc0c..8dffcce04 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-color", - "version": "0.12.0", + "version": "0.12.1", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 271cf7ee6..11a2eb323 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-contain", - "version": "0.12.0", + "version": "0.12.1", "description": "contain an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 2ff342ccf..c67ec9292 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-cover", - "version": "0.12.0", + "version": "0.12.1", "description": "cover an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 69541f526..495f30b75 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-crop", - "version": "0.12.0", + "version": "0.12.1", "description": "crop an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index e17a2bfdc..8e18efe7d 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-displace", - "version": "0.12.0", + "version": "0.12.1", "description": "displace an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 1233cf568..172d978d3 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-dither", - "version": "0.12.0", + "version": "0.12.1", "description": "Dither an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json index 61737ca1d..2dd417bae 100644 --- a/packages/plugin-fisheye/package.json +++ b/packages/plugin-fisheye/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-fisheye", - "version": "0.12.0", + "version": "0.12.1", "description": "Apply a fisheye effect to an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 5e1cbba3a..7cbf04678 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-flip", - "version": "0.12.0", + "version": "0.12.1", "description": "flip an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index 84d137a28..4d631e65b 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-gaussian", - "version": "0.12.0", + "version": "0.12.1", "description": "gaussian blur an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index 469e2e17d..90bdcfe9a 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-invert", - "version": "0.12.0", + "version": "0.12.1", "description": "invert an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index c1be199d6..4f4628f0c 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-mask", - "version": "0.12.0", + "version": "0.12.1", "description": "mask an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index f3b80c511..eabf92354 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-normalize", - "version": "0.12.0", + "version": "0.12.1", "description": "normalize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index b2456f123..51329a50b 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-print", - "version": "0.12.0", + "version": "0.12.1", "description": "print an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index 46547d7c1..2b49f6043 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-resize", - "version": "0.12.0", + "version": "0.12.1", "description": "Resize an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 0ceeb35e5..5d6db4003 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-rotate", - "version": "0.12.0", + "version": "0.12.1", "description": "Rotate an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index d802057e7..8f99e597a 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-scale", - "version": "0.12.0", + "version": "0.12.1", "description": "scale an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json index 23b65ab71..512f2d053 100644 --- a/packages/plugin-shadow/package.json +++ b/packages/plugin-shadow/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-shadow", - "version": "0.12.0", + "version": "0.12.1", "description": "Creates a shadow on an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json index d8182de94..d8a8a9449 100644 --- a/packages/plugin-threshold/package.json +++ b/packages/plugin-threshold/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugin-threshold", - "version": "0.12.0", + "version": "0.12.1", "description": "Lightens an image.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/plugins/package.json b/packages/plugins/package.json index ce70c1852..a8edc89d8 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/plugins", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp plugin.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index bc9fe96be..a98d23022 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/test-utils", - "version": "0.12.0", + "version": "0.12.1", "description": "Test utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index fe55f06a2..91325345a 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/bmp", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 5cd49700e..0b0b2cd5b 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/gif", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index b19518747..1345503c2 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/jpeg", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 15991d670..c31894e27 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/png", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json index 26207680f..e6657aa94 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/tiff", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index a9ba14533..25a64dcf6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/types", - "version": "0.12.0", + "version": "0.12.1", "description": "Default Jimp encoder/decoders.", "main": "dist/index.js", "module": "es/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 0b8acc6f3..7ae2911f7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@jimp/utils", - "version": "0.12.0", + "version": "0.12.1", "description": "Utils for jimp extensions.", "main": "dist/index.js", "module": "es/index.js", From 612cef4b399fa75319f6037f1ad617349fb8e693 Mon Sep 17 00:00:00 2001 From: Jeff Bonnes Date: Wed, 3 Jun 2020 02:15:14 +1000 Subject: [PATCH 084/223] Fix one file testing instructions (#898) * Fix testing specific tests instructions * avoid confusion with file names --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ceaabcb08..2b7a20209 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,10 +47,10 @@ While developing you may want to test only on node.js: yarn test ``` -...or only one test file: +...or only specific tests based on describe text: ```sh -yarn test test/some.test.js +yarn test --grep 'my test description' ``` ...or run each time a file changes: From fcc5b2362a3f5ac56e6a313c281d89827f3d067c Mon Sep 17 00:00:00 2001 From: Jeff Bonnes Date: Fri, 5 Jun 2020 15:57:31 +1000 Subject: [PATCH 085/223] Add single frame encoder for type-gif (#899) * Add single frame encoder for type-gif * Fix linting errors * Update packages/type-gif/package.json Co-authored-by: Andrew Lisowski --- packages/jimp/test/filetypes.test.js | 7 +++++ packages/jimp/test/images/flower.gif | Bin 0 -> 721738 bytes packages/type-gif/package.json | 1 + packages/type-gif/src/index.js | 13 +++++++++ packages/type-gif/test/gif.test.js | 29 +++++++++++++++++++++ packages/type-gif/test/images/animated.gif | Bin 0 -> 82921 bytes packages/type-gif/test/images/flower.gif | Bin 0 -> 53702 bytes 7 files changed, 50 insertions(+) create mode 100644 packages/jimp/test/images/flower.gif create mode 100644 packages/type-gif/test/gif.test.js create mode 100644 packages/type-gif/test/images/animated.gif create mode 100644 packages/type-gif/test/images/flower.gif diff --git a/packages/jimp/test/filetypes.test.js b/packages/jimp/test/filetypes.test.js index 1c67245a4..ffdb63776 100644 --- a/packages/jimp/test/filetypes.test.js +++ b/packages/jimp/test/filetypes.test.js @@ -36,6 +36,13 @@ describe('FileType', () => { image.getMIME().should.be.equal(clone.getMIME()); }); + + it('clones gif with the correct MIME type', async () => { + const image = await Jimp.read(imagesDir + '/flower.gif'); + const clone = image.clone(); + + image.getMIME().should.be.equal(clone.getMIME()); + }); }); describe('hasAlpha', () => { diff --git a/packages/jimp/test/images/flower.gif b/packages/jimp/test/images/flower.gif new file mode 100644 index 0000000000000000000000000000000000000000..d4bd4a5249c8539a0aa43f54d7a0493006a24b57 GIT binary patch literal 721738 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

#jARC^?J`MdjTa;1ceU2w~l@YHR($=DWgzA zla4gyP+HR!b%|ljQU~?pg9t1)9dYc2VIwOkT!V91o}rVT!R-J64@RjA*45>%rAauf zfVbs-2RB_^uWUGgSX|nrQ@3bPO?f@$s05o1qClxh+~3Hend1VP8?k zDn??U0NZl!t^k{N8X^i1O%~53w zie(v8h=+KEirD{%kGL1`Y%82N&w@c`ofwLLc5w&|ul1UWgH~uA0*e8Aiv|0oy!fUP za{LNgX&)4@R4QzRo{(Q%eg$I<*!Yq>XEriW&Tk@<3kdYgi zd-|4p@D@wYhmteny(A+7W!u^Si8RELf~cpHSEEc_LpDG;at%wA-)#gRD=Hlef97;e znHx7!kUCuXPC<7o6R5iV?Ky3^bRnoKB}kL~f(?ARP=Ps^1%$O6gmxQ52yIs`k=a7* za+!0>hW2tVH}$tVlX$I}J7d~ZAtivBw^cXKdB<4{(V14)nVsF44dGdP?NC^aRi5LB zUmm6Nj#~dUn^jY!0HE^~7N=?J>cg~BWsv}c5#`qr_1Lm2aaSTbDvV_~4S}hdWeif$ zNknmqI@+TN_!Lc%q)Ta}`Hq3~)q#DnaJ0f z_NaUg#$nLvVKJkq17>2s$zq{#;mE0>=@^c&v8rGAs%4mFvbvtOnrFQFtCa?2Qd44EYPD}9H z!9BU-G&tOies1Hrt%EvN5OggIv-m9rzcRZ4iI&%6bqjhnUl(>APHl7{;*42l9jb+t zd4`fOFXual`qD3#9PtV~NQ58`^&|_Y1gDudoCTbVwzI&emz~?Wyfo9kL4Lu*SA5y4 zpOq&2BGhR#wju3a$Oz_xv2t*P1{C zeb5U%uJ0z%6e^q{foU= zAXWXbS-o{yhh(yrvU9ZP*^ZBc^efJ`By~MWeVrwN-AT=g*s+O_iapv^n>q=vd<1t0 zqM&doV?}xrkW6Ddj8aTh1KS^W+YgJ~K=71}JKU2ymBs(wSXtfI{gvDO-2?7)XZhbw z_gPrcyV>{N@%?@Ey}bDyAb$Pg#Y-T;g9sBU{KBPVl#?f)s9gC3h|8BSW3re@v!>0PI9bFL!V(BemMEjJghI5a(W6L{DkU0( zX^^K-p+KEVwQ7)D94h(qj-@}6WvLp;xrBW(Vph%fad9Y>6RRUMp%(-*tFrYz`8Eu9Q8$YN4 zsa9R6kRd~eV*8p+8<_3e!*W;K&3m`C-@tqCmPVX-v}ey^zXo(i%$PA(qDNm!-Kdr8 z*t2WDK1I6pDN{Ui)*`;V`Sa+fOx}w(E6lE5x4OsL(kI^gPpVVTFPZq=Ddw2F5cK6j2t}mkn!5Dj=9_Q^<7O~)))`JX!Q83mo_zM{=bwIx zBj}xi78*{Wh$bq|p@uR_sH2Q7s;8oqR%)rG8G52D(a}^)MM(YsHUpw zs;su^>Z_;PBkQcR)@tjmxaLYLKD_pdk3GNgs;jQ1+5;=B@+ALTPqNH5>+G}8HVe+iq+mI3e?We7}g!3dL4hJg$-9L5*~hL&J}p^ZUtfSXBS-hUi-?6DLMI_Td?Qbh6b z$&^)*vUpmM*Ye8*wp^eZYM^0r&1lf9vl?scO!FE*2QBo_L<8-{(MTtav>Zyi!SvB` zME$hWQdiCN)JT*Vce!7ZIY;z zpc#Cl=67nVvDVt)g&bn|;c&VcQ9)=nu8>0vNmS9~uweg`(MB41)KMKGjnqX+T*O7! zO7m$I*6B96hnG-v1w|JWju91^ezYUi6jM@3W!3Jymp&irz~khC5oW2C7F%#7@48&9 zr)1aY_(eZhVV7N|7hV8gK%l?u0S1L-d>Qqi?6W@@S@q;ov6)|)p~o4;q?Pt};D8u1 z_#v{uLIHn->HOxR5Q<=*A1BEC=r6}J6nSY*>p$*|7 zeyur#FMvU!5}61^G)kfpmzYEyIZ;PE@Hu}WCVQkTZa zrCn@^OlS;~nH(26HnAyjagtLn>SU)o(Fss^%p;%>6{$h>@lt;rl%xoyC_-N9keH&> zrbxxeMmF+Tkc^}xU1h9cSrS;6%$2Z!<*Q5%OI602i(c}o*S!LvuYL84Ujs{~zY5kbgNxVA4smc=6GPa@#)iN`BD$blMJ%@m%yGmcoEwQqK({>7jZh}RLmdh61DDqw z<$DcGYEzcVyQV$`2v7a#OM*((nw;e<#%oIy)}p-RtxhPSGvP|Wx)}D9&o9&y%3&5m zJ+n4uFyQMC4kJSu*q!yP=iA`LMq`@OjC3`xnIHY^cR&2uMmPWS-~V(ezyTJ}5X^Z_ zbgUqSD^xbAN`c^Zz%zviULk@MoI(aUNLmhh@PqC7U3{b(6S2DXghokWg;v(W08!JL z-sD&fbvKpVHHBjsdX9$f&>;^ME=0`ujkc!$#l+@1mx)h&qPBQc#VT&28%RP@7L~Nc z?t0NmVI-q?&q$0knzu}Ae4HEC+lw~Ak&bklBYf|OCq3F%kAg%bA|J)aK;~D!07g`& z5;ZD8Ir6}a6s3X}3@cAM_`$-8@UM3DU|H28l(AwkDmT1gRkrfOCxWFcM=Y*!^@bU` zltwO%!%I34sQ<+YLrZ&x-<~a9-FYJ`3&hsg2<5ShI7-6XQ0jpgkgV|aaZ!Jx zs$~(v5r&=Bt{OXfseWx)KZqFeML{qpnI88F!WiOIJ>s|4hSM<1$45oQs;NpF*V>& zA^7T|GKV?Jv2_M}{p+!^aD~Tyt4?xq!epNn*ij{qQgZn1&-yTkv&Ajo)E!*31Wt0v z1;FC0*f@0RC5&U72w@J>#y7_C85FN$fc5xb3LB8lhYK+LvGo;b$5xu7WfM}}8E z8Of|1dXA}c(PWTW!|XXvGVct{uos$|-z?BL2b7>r^C#AlcIJiNS9J_I2Y=a65h>Cy+$bVD}HX-`)U)HWS;PEG9v zRQI$eKJneJ!?JK>vo1gXDMV_%sk78v@4Bf9#})I3I%QEjS;bXc6&GG*Lb8S*Mt~n^ z)mF_$7}XZ5ZemcGZD*l^L4RZRbI81L9YIB{+kF2!lmfLzHgp)^7a6 zSOO$(^-^z=0k5SoeseqIFu=DQj1Wq7+JLmx;cz zNwR`=xH4g$cqDPzm)l3egz&9vpedLCH_2Ystm`gG!94QuWkCg}Zra%jH1v_{Y`(_251#m$agaSu| zYAJ$234a>-9xB;dIH_!~1BEL=jVq&hMn+^;h;a;J6*go;BI6$yGF)E>2zl@tLIezA zI9;lQhLGu8YM3Kz=!QbF4a%SlR}_a$(j+#=MLK7Pct}QixQBe$hidYN?-huJ*qVH@ zD2*6(u{oQF1c{I+iJc;eT1O6+*qg6{iN%tMmlQ0!vWdbeil~BNYiEk4h>F*;T&uW> zvE&SS_ZuY!iz${%vltA~P>Yg4c!_|E#8gcD!izcvjLU>D1+z1w0c6Hlg-eD_+w^4T zp)sHTSB<1MdgfG(rl)1sXg7MpF!OXaWY&7G2Q+99j_znQMl)wk15oOSd%0(OYQ~_j zCpKVHk1vCd$Jb8Fw?L=YQC+q-edA~bd63!1eM85PefW?N8EO;x5f#~fs0Ko+Dg;dco9w!DMhX;8eax92kC3hl^8JV)GM3cFO(`A`Of?b=*nV$KXRRTskH=1Wu znrXxf=(P};Hgv+^5UM#Rb>gh`Wk;^bbhKHm)_N(niD0_9t&&I%-s+p+S}e&~Nyk~P z=9(+vnkvlMVb1xS-w>UwC`))JF18elvKV;kq6jbcF5qc+HD+VH$asx+Fu@39?D?MX zNii0qjI~vt_Q{|BVKUQ5de!Kco!Y4yC3y*e&q4X$x64jv-MQF^&j~Fy)0GW*>Y8o2iH^gOq*O#IS=|(I6b!jas zQxF-EH>G|dacUQ7ld9$(mb#=mDi*Ki5WQMcayf2b0wQ3?ea;v!74VjrF zSj4L}*ImE*tF|CU!dgaQQeMOwbjXUD%-XEIAPn*)C-gO~d31=^I=}S)YjvKIt)s%N z+v=_S%bV%yn_`EF=Q_aVdSMoJVgG9?>k2LHiY?n>4bj<(;c}f=X|J;w4ehe8{0dC| znv3LVo&!s;>v>N>=AP||uuOI_nzu3Elx14xjH4&96brGRw`CZ#u>#q#1M;zAR!`sv zH2Orc3)-L#nl$V9G;wB*RO6uGNV9xaj~v>e?xeGEBf1wwXdA^gcvB!kYX(GHkdP~B z2${5~*-{blQfTZ_lk>Dt8?_YKITq=DsWn1u%K|+55?!kj@drI}fowwhaQhb(yY>WU zo1`0wqjfwJE{Rnz$rf5QlMHwtSsJ!K!8#Xs$!+PkjbX_QH-Ux!o2Hl1rh4@m1LC-k zJ2>Pvxs-dSmy1|e$)}zBSgK)f_r^e^YaK+P9cB5IJiC_k$wAXYR!A6^BlMQ`QM>oS zaZ;u+R9M2r7-UNJ%QQr)TWBF;fT~4nyh22BV>m6z;=JIzBJuzZ&BAip0uC-$y+Crk z$uM(SWDMIIB~p@eRALLbU<=`^C1y0NUqZg+dnRatz7e6m&N?UZWk+=czl&JE3|+1G z+erGmzy15IzNst#jKBy?z#4t739POPyuhopN)2o+5iG&sVhyj@8|RXh+gXe50-iK> zcmOM~1IuI6^vsiou)Hf8o2SAWgk>~bGBPZ~L47hBG*JxyGkG6NW3(A;5a7@{hCLyf85lBL#Y?A)nY>5z&EX8rW(d9JEWMTgsm_|2y}arqz3N>$SI_vI&tB5c z{`}9!8qfmmUPZ^g>njWjj^Kls&hKNS60aj>OPH%m+ZK$_;?MY8e9W+1O)bBWZ5c;6z$g;Ip#QTKRPE0m7d$TyZHp(Z~ zUx~&4NKqt;)+1HCDri#LXE=o5)&(wp$+}*4{j_+U*LAShR2w>Tam)#~6>Q6+cI*;6 z`Vycmw?8r5N5NE8(b!a>$4~)PkuBIYQQ0v68KqIGfQ~+wpM8^kjFg4jrAJ8GM+t#M z*|%S++HAU}n?dAmx|bj&ry@sgb!w;fb6B{Yxv$Jvye-Q(D7vEy=~hs>*@4_(tp&@? z+D=AVf*U>5-D?_&%$0mH*wo|Q?cG;6&Hh&v5JKMNoz1Ud2*=CKMl>xd(%#Pd-tz$8 zYRHD#f~%QX-`X3`bLhSO?cd|u&!uUsV{)2!?nZyO;0dna32rCvJFT!O;SdjC6`sEr zzMC4J;Un&K7?*`(4^ zP(_o~WaCg;{bx2)<`?wU{>Zb6CZf+LeWvUO#TDn1Hs^JI2zOraYw}WRyyuqF=jsQ? zf$kQCop6YJ=sWsqU0dCe96Pdw*s;YQB&lmpp=^&o$C=)0D?r&UKo*_8*>8c9cRT8Q zOq50$fk!Bm*8{i^c$Cv->S-#XZ<4SaI9SWm0qIGR z?AYtZ}_ks0k3ldJP;X%%H%7 z2g3ymwlLg7h!G`DgecD9MT{9WZsgd}<42Gg%Z(&i(&R~VBh9U3*^=B#m@#F-tXI?K zO`JL9<>cAZ=g*q<>;)BC)aX&9NtG^T+SIAjpg^Tc-Dy+aRjgUHZoLZ6>sPR0zkY*9 zR^8dN*3_~X(ciy`5=|1E$WS1}ffxn))7Wtv$ZgI@ zK2zCp8O&uWmtlihjT$m!K!+w>+VttrVN9zI)7o|GDzRn94l`S}l-N>q=hofZ_iy0A zg%2lQe79}eTC{{#PNq5kYBgx2NB>;i`sX#-wQuL%y}KLm;l+<9FJ8|1@#oRIkyGA% zc<*WC&!4|0jdc9^^J|f=-2Z<7wU}axE2_BSKmxBw(7*!^oUOnrl#4CE=R#wH4Kw`E z@D4xj$RiIx0Qs;G5=$iH5EKs~L>CrYbn(R(d4cgoSZcKK#yxV>aSuIu^sz@ff()__ zBE2xuNG_60GKwgGc;d+?fRJ)ZDywASN-VR~a!W3^G=c>qs&q06D9e13NixlR5(+lk zbn{I%pA2HoAmC&(2sQK6vrIAj^s`Gq0}a##LR~oG2q6+xR0uR1b=1*4pGZ?rBaC>` z(kC$8lL}5d?Nn0#GAI3%iaa@e!qiAlRrN_vQDwDNSYwS9Ia+6XjWjdZ&@e<^0V$D0 zM1mF87h;Pgb{J&snrm6Q?yBpVXr6gS5=0C!1duz-7^8~@8?^IVaKnYd3M~@M;+jaL{**L8tRwzi#(@%W!l`={{`Azj-Gofe{xGG+A?X=I>_^dS6ZUc_ZD1wNX z&N{nn_k)&sG~Lpm#K@vc=oTG9qI_dC|SSqI_#?6`O zamc5_X{V|rx4fsJ>d8DR&7bo8bI?PFN~p_Auc>mbQdeD`l*MvAEVN=*r!Cs8VOFkT zoOPBjz48Jqu)+j8EHT6!dkiwml0PFe&6a1r3^mF?ZF=fYGq_;a;H{P5-Hh}8d+>*= zwYCTYbZ&a-Lc{Mm_O(;Peeb+;V-4}>e-FI&$ZK!C{Ml3Q{_@xlJn>6|ee6RY{UoqI zXrNF7wGbP1bxVR1bdZ5+1t8OyL4#(vLkBzbp%CTaS0zdjicS8BGQ=AhI z`xHbhcF6@SAk+~EwJ1e3icyb3q7J86rXi+rilcfJq*V2(H%7`;X0jKQOa(_+NkLY7 zl$Z8w1Dn!hNJD<;6(BrTB4Gu~Sc^nf?&@;8W$8{D(V7;uu9b&7h+zz4kf58cATCh4 zsa$L#S1G4(E&>fmL4F)xZOG?GSe*)v_p)Lw_thtU?dy!G8dz^^WiZv4W?`ct4QzPR z8z@eUPEd$q5Qfm3E@;d{AOaR54&jSokjxr9^U76d_DyhxGn_WlSlquc=L+`z#wT*7i1l>Vj=EItYsdVmE`}EujhNTSFgWk#G!7 zq7$X4NDy~Xm84`P8D$*gJSr2@am92a#fj)ldQy~nu5+0)3g<}56UwblrYU3H>ug#U z*`cL&YKhD3dMe4fFoZ9`hz4LP0hr(!W--JwUSlFd8Rb1ss?w`oRjJ1sU=|E}tUM-e z!uM4vKmn{^yvz*gRXFBYA-x{dH9W=yGI|IxP0Pm+B{^50h{IlzLv{OI>7ErJV zRGS8VWL2R{VD5q_+MCt6VoJ?kPCw$OzygkcQ-Wk^FC zB56sD;*%A9m_^uL=}SJOQWDEFsoRDMN}+^;6WbI;H&qNuczObH&E%v=O(_Vr>|t!3 zi={2PKnPM=l%vKND%K)VQoBs!5L0!>I<87mR3OtVaeGJc%2H3^U6sAuiz-g(agR}e z)oiGM9Aj#AtHI3GAPbpUkPT~*#cJduAz2McQc_x$yjHe0>8(%lR>GnrB`Hy<$^=!A zs~e8jePhYq9Wu9;P}1d;o`l?89+64Ep$#xwLxy061~dy}*ld0SMT!A8tkCSj7c6_o zLImrY*<6dsz~W7DCRxegOkFw6c}}3IQ=RNg+B>bBjCjtIp7q3Mm&-=~HhzX#Yyc&* zj8It6gD5m_YhJTMDFV@mR#eV&)=1$lg3-h!u5lgxXrF09(yY96q(xb2N==FnLnnH3 zNfC5Uu2K(~s*a{Nz3De{x>L3s7{Nf@3sLn_2~Z<7sfl33Qj6ErKRh*g&2!#Vt7BDI z7t@$omCY;Rg_|n)Cf8#XP84|ky!9H}@LNM%q*2^Qh3J=1;#KY zDhiCcE*X!wr|x<;Q))_6c}eA}S+Wtga-8G8-1{m%=Dbt!(%!AekSjqFl2;@2SRxfU zU|%L<5)SmQ3+a5AEO1U&K ziPxTSGoi^hV|Q^dV@#USTrb$Z`E8EHx?|mRp~sdrq_sZQ3v6n0n<%5{%2c*w$VcAs z6U}HxyYiK@OwX&;b8GhOve(WAW-;rt%mIbbK;_0}*vH-=6M-|GZGZbZ z+xgCTUfiDd>}TM=T^Xyhl~(8afkRURE_N!OJB(yz;DT4uM?0|RxEz3biY zL|qs|l$xncl??J$y_u;pFV^dCSlwUqE?mbSIlm5$ujwzo;2;Ns&+$+7*7twwP`2#A zj%SOu`4J#&3y;0RAN;{91x!HrARzjX4{s|h{$L<+LypFhAaZN0T^qLlSU1ViAb0~I z5y`BNIS~`;EPO+u(6W(zD=pJHEgA|qBN4cQLn2*byDLh#jsqeosT3eEqnVqcHYpQv zskk~Zt~CJ|6gw^vqpcr&u8#w`M4_%Qf)q2-lPxq8HM$fqj5|$zHcvCtsFUFns~G6bUwnE_L}rIQQ)?Q^_RMd@U8iFAZJRid> zYXKR=g9~RU86%@9B$GT{ggmXNJj=Vh%v&dA=myT~ym$IM(90UpE4_Rg8`Mj^ee$Q( zdmDjr8yA@y*~`X*5QlAiDBSx-aNIrK<0y@49GGyN;PbQLdo<>|9F|f(c#KDt+MISg z9q5y^>9eUzvj&~29Y`96P2;q_=sra_s^3Yf;TgZnOlz;|{y3Hui`~2Bfz2ctB~BzzMvM z3ba5BbRZ2|ti>`n2uUmp@{b6akP30PpyLn`8IjDYw-szb&w>SASfPF6HyHA_f2)Hp z;7WlDxEw6PTAIQj8lr|10#Dqn-ininn>Z+XlO;sLju-4ja4JXcdVwyB^HMO>~kS zyqB~bL*Ianx=RgGbeQ0H%ZvLB!5cjPY9bLmJcNPBrds5go7sw8{7!MAJSV$6%nQcN zLz*fxMy81;dD1e`+Ztx<8fcu)F`GtetVS7;5pCR0HVa4p#JzD;337CabS%(63#ocE z9i%8Uc`OPS>yJfG>I$oJDtU-HPm8;*|j$cuEW0ttiu>%U?v4P_HjlvK(5cpvN_K$bkfxwNxn)zZOab8LLi;oN&NVao@^jm5lW!E4L>4DrR*RNx-4HAp%tt*7L-aBdBGal z146h;8Po%;+&LneF6Gt^iMbof+{Q zPhbqjqB)xMRL}K{nyYEgEqhO}sfAhq8~U72`@B#594KDkPl^?W|GZc^3((&CJp=7n z;VZt%u~5uuP?Ajw3ROP;k##-{O&tw&9S-eK+F_QST20*vQN8#JP$N-OOAJ&~waZvh zsd~|>QjTD1FtZU+t|^vg3(mu*mfb#-A?NcT}OXT7qLIolsGRxys%sg3Cx3oCS{g)?v!nYI7=RyG#h^^?7E|Akp zk^9u#niRqeL&;1zm5UTJnxjU6uglz&H9{}=s#QMnBVfW6UiDR?3)a&lR%68r1xwaU z+9YNz7v~KZXSL1$Ho?tnjl@0D)@{ufx6`=FbrkvH%~8C&7_~9sKv%J{7{HT)cHNkc z5wdF<8D^;0lfgx-$XEM?8P)N{ojE6e{a1h$*rq|od3w)fjL)!XSZKV@GGmeaG&5b8 zn+L8~*yBcnz*r0Z8;$inbo5w{WxkM2*^*+=k_8<^J6WYLVU%qtkX>1pZCUDjS?seN zW-(Sz(+j_d27?5iq)H4^BR__WDxm!g7ZqCSG0Hha+N3qbrd?w2X&3VWQq({L(n!f8 zb*r{&tF5i81C%!O=wh*Lz?p=}0AkYa$Vm!J+x-wX0MWp5gWI9BF?V?&D6ZRgyIT`X zQxj2PO((kCwM^F(D=`wg zrR-(oAo{qzoUTpHLfmr9NI6w6^sX;NRXP$CS3wiowIj>KIrXAB%`CfD<=y)7OmW2? zT!A;z{1sqLqyb}y<4rK9Q{H9mq&A7(apA4!wUcO-R_d)@R`M`D(zxu^UQPbfxtyZx zqA$)AMO`IVTiZL|Kog6(QE0*#je%ESeP8WdypzEht+-!%p1daWMJVfEVq_*L3^V7lYwK2P&LMHn>`WeguSzn=wK z^&{ftFgCREkJcEsat^y1Wn$xC5_SGH3j)a}rdq2lER@t*B`sU|nIA50KnE0C2b9U1 ze75_@QZ)WHHGZJjuvP|)pG0^ovOC{aBTolx;uG_L)F{JEMHr2#DlOjwL z$|Pl4HpB0lOkCEvTOA*y^*OukRe1yEU=}cA2?pcc>AZNlYQYu(K2NuU}8XMg#~bh?iz)4=rDt5`xJ(WrD%%1Xa~>WkB;!jX|xXp z;gfa>3PoX;zVHQAVR{6#n8pg4eqk7fS#&sYNHSKN^_?6B>OdF-p6ywmML(b=4d@{Q zs(MkS9?5ajFWlCisFrFeu)n7rawFGB{Zr#06;iII4wd}sEEXUHd`YwZpKF6sv?h-N z9IW|h>u}3JIsQ@yX%O6)0=b>PccEH$GgG`Z!C&d?J#G;`25hRVx54HS!tS^KLeA4Y z-BZQRK`1;s&xUMAZaCBy!xTHh%JrAc)VCu8ZWY_;qhAV5JLGLV{*^uC!{8onW0e+4B1BA*O=VU@ za;eQ}hVFKm?)#boYex0faxLNXR%izpG6Ls09L1}8Kk)gx8=cNq1QBZy7VHEDWQbq( zZg2PYPWZNm?_8bABhUWbyv@t+ry*GW?(g>m@OxtDgl=d9Pn)*+Cj_5H2A4ewcJK!m z2a_0waTp1OmvD!laFMngtRQL4Aqo!n90}EMp*Y!$zwnCxa6q%il^t>am$m7fI&l=& z=>%JGoHa-iO@u)ZKcPm^A1-R6ma!a{$T>DjEy%C@0=xV(XCY@|bb}zIeCw?)(zPnm z>ab!g&f)=rK>v}+v9-3Z&2smUD>L@;wLPo?f$J);)(N_`qK6lv1zx+oTR+h2U(o|N z?`s(8tQG0&K#sw}Hf%ocbAl^4Mp5KTob)U))I;sW;|wcL^js7h&b8z0D3rn<99`1w zA}kbwA<9c6LQFF7xAE!;KrT^beHmgQC#J6#r6{?ed3{N-OI-eMu< zVz!IcBt#Ke-Z5a-W^L~1Wo|Yp_TAK;KDuVkwGu7aR&KV$<=<}qS0=-q8`o>kuU5jd?>BdFP#yTjS9WjrefC#)2WWZU?|Kitf<9<`_Zs+L*nU6ofM30V z&qjl{;EP)LasY^Nf)r;md>eQ#ztXaca z4eZvkXVaGL<~Hu!x_7&ggIf-8-@Sta=WTpYa>xRRA&NL6i6xe3M2J8bVZ??Ry7(fDG0K=B z6j0D;Gwlc^zvW4Ov) zjaOI!g%z{bcq^{C>bk3~yFxJqu)!WWEU|_jM(Ch=?#SYXPc|!}kwZ%Bp@uxt`C^Yb zuGyxAfGWx;xQq7H=w6IA7MW&{SqOy`nnl5`WLRG}OF6JvG%; zTP=<_Ph-6`*If(a_19gCJvP~8n=MW`<)Dpr+HI#j4%`AQG&kLK7t|0ad4uAKPJM4g zk>3`DbW=@*r!w^U1x>|0@9@kuQ;dT36dzDcd@1tqK*YDF2JG^0zRRLM?opF|~Wfn>SMG(qM zUm0lAO{drIra_k)Y_GZIT5M?4HvVzt|3+MK!QCd@`sV8<8*^(YCx3I>+kcw%gH<8? zXWMnx|6`07p5zgWJbO70di)S6_q50VQundXej<3E0P#mZ{rQi9GN>Q~IjBJqicl9Q zR3UC@X<9^b5(-UZB^FqzMPa%Y3}YxmYXzx8H8f#|QfML+Bxy-a(jkb9K&2sG$xKIh z!kW?)1vIT_Oi4u3mYBGu8O`ZMczP3t?zE>FZLv;q;*+wHCB{J!4^iME!=u#W2T8H< zQt-)_rV!C7PnphirYaR8@C67~xoSH#l7g&!CCEYEs#d$2!mp$dEMS%KSdAQ`ow_I^ zW_ie2&cdMyX_ze+ZBj;?Y!MZ?)u(TTD_o@k*SRVag(0*nGC_bBWaRaQIBvz*2<*0F(wteMRuS;&)lbvT1TiBrX&Uw;PZDMm9KH*l5xXI0K{`@CF8Y0lW z>5Xy*J*ePpBDsY!lqQao2})-2IEXfMavnkGPA;cWd1$VqN#Ptw)e$<;MTIJLv<8d*lpsX6*07{NGcsO~6gyp#*(?QWq!k%CWfXmrm5m&7=y(vyXG~s zDYKq^vzs<1CysIde9j#+O&CdQCy>{PHLcOJ$VQ&0J-LR@eeyGI0DZFE1UgVDL&Ttf z!)V_wO1O%0*>I41XyPL35y!1Wab2#-O|U$XjRwV|ZiYulK{`^=jjnX2OX*g=0+yDN zWe|gasq1Fy7Pz$G427o4PV-V1GVs)=*u$RnMk7?>5%qXZRb^9=>MrL=CaIT>%<$6s z=+T^&d$D0nR#UwO-mF@z!}-mtT|HK^meo0>eok7ous`eUTGxm9-)ANRtjSo~(vk@^ zx$K%iys~Ffd9V~<2?4>t?&pGrJ#2pxYoHA-sIeUs!w0`0*~xOUzx&1PWmVK679kh8 zL4eV_vGrg79Ny5}=SFvHL9`@vyI@6FIs%ohWLw&b$+x0_xm zEy#vH{Mo{GYL48pIz|!vO1l$CK|AP|xug8}X2avOx+0>Q&dp2emceU=>!j4T!c82)B7#2Zh@g z$V+5RNSl<_Y2jPCdB_V<+{3jSX#t4`BHfTY2?(~9Yvo%Cxj=~YTM+>qZP}J>z0eWm zR+=!}2$qQtHe3`rQNeXq#7P`zk)RdfSH?LP@g$0YiAw^lk#&vS8^zJ4a7r+6O3I=C zl&OrD9<55NBu31s*UjmQA)TSF=p1A)(xefOb6rad-5Y=LSAQuX)9J_&7Fa1sSF)Ll zf}soayi4>bl@tuY5X{RRblojwp)QFX+5M8)r5z;-6EevI+mRUDIg{MYoiy2CMzCJ!JrwG#-sz2*M3GtIC}ZIuV@ACmM{yMG4TbIDo}7hFHPBg9oD`l#gPwUs z@J+(-5#L#?g`l+sp&eT76W^9^K0pw*IivC6a9~qRI z`CV1~rJozLn)Puk{5g2!OM+7@u(qT-rV!tN*ns4&~4m(>4<(k3yDC<9g-Fa zGF{U-omduF6!xJh!R0?f#t=YH5ELS0z>6#`;uRi($@xOR@Y2{7OfqTzl-gAyZAQ%6 ziI^sCV%&A2C%RbO#aQ0yT`7_xDi&watYVK1-YYIAEPjpRWsNN&8P?>Y+l&L`^&&3< zBi>}5<_)8F8lyFaXGDO+mQkbRkX}SJBYHv(M1fi4n5RgH=apfjPi$lDd1F(|88}u& z9hKubCPF0$Um^q_I~w0w%uYNS+M(6sqS*yL0#EjcU#}_VKN=fAk`M`D+CVzhTUAd! zPE|tUUsb6=`OU^@#NR~j2Kx-hif)yv)mr`7->qpRM{;EGU|$skpa2P=P-#K3od*KW zrCwbMe!Qf#9qE5G;7o3t9Wa)H*rXVM8wllOWL-#7E+q<43yfUK2y>msnzmn}AWAfEIp{pmG(LoPZy{DzU&N zqnKoMRpH3pC0=&dck!N9my+c=&+?ILzUnRWu> zcfKnpP=a{QYk9(F;iRYPftfV6XEfSt>unh__C!6>?mvg4z!AIq36^2Jm>SKK7c8x+Sp?BxYc!_Q8^;!IJb?==DVvQ00$l zi0G{?(skWi7fbZL&9;Fl^Tx-E&Az80D45SpxM zoN{HH?kyA*A!c$5o(>nr-3b@*$rmLH#=VIYtR=^tk;gGx6^a~oF{;UV7s^3usf<@1 z6~Z1xX%}2-X=4%NG^VIlQe@iyAtqG|3ckp;=m?kM7J=!Bt2Roj zo-X!f#=DJXtujv{eu2GcSFZ|#*u5sfupKa2OtBX0Y3 ztF>Y)Iq|~LXzPy+9=Cd{w+p9X5Ol#wX`X{0Es zU1DKgYDIrWYUZMfA#`r52xiP->gWnm8Wxhx-3mw&8~>G2>K4k-?Z{NJNKnG=v;;{F zJ)E5aG7RNzpX_e$22iKD%Tm$m@UqfrN*G@L!Y?eZFNxUeMK7^lqQ+D&GhJ`?YHx2= z6E4^tjD0WomZJD#tN99^`gSY0PL2D%Z`Z_c+srThMp?UdXa0I8C1e68@Gm6vum2w7 z0(+SOuP1tj*?ZP=HR1%83GBdb)KJL(9t3lv1XD0cEo`V@a0Z{_1{0{n3PK}LEP`e% z3EPDl+>QxDAB`3Uq98^KyDSW&tfpmJ4Tq%f9>zhE+F98wi7p3<-iAZUTKeQhi@NBl z#hvara=qTC$GG{J^D$U8&%{IHtcJVGE@^Z>AD6eaNO!GRgh9Pq$ zZWQ&p-SvV@_CBj`O6#<0(=~^0HW%kMr*AiVv)C}h`zG1B#_uln(>c#gI^!=Tj5j-f zXEDYzddKrT|1Uo;6h6N3~l~tq<92dN?)G~&s7vV?MW`8QZKdDPAyYEwYIfKO+qPELkN{t zX%(6AR;y5o*bohgHJzaUc2<-1StH4quGZYTAl;&n9`7w(kNI!GGFBU|n)|h1@3jn} z<>7`=V1G7!k)-3M5nVDec446+SZ**dc2@AEBx`QVNp{s$wq?H;X2Vw~L-BXi`C^*# z7^(RrF%e{zDl510XlV=J&X6eSu50&Uc;vFCxyUO)fi5Fr5g2bCk#pLR zgLi-TLWH+ElQ%II<2%1|dXM{hV^n=J)B)eKGw$=bTa-W3t4{><14FO`F9m_4LphM6 zecwB|JhkIHK6Xa$`vGvrf z&7%0t#?OkkxNg9BjE|3V)DQVx_zG`_C@*nm42wrA+tVg>16{F@GxgOPd14`Xl7BH6 zOKFpH!4PzMe?@tzrZFgq7OJB1scJdg0?`XH<(GrV3Uv9A7?GLxZPvr-fZ^_%Y*Cvx zS6R9_r2}@JsAXVl9Hbj{xZG8qE2`vPAr|^MLl3&9RI(Vh%40wQWg~if0m~ohsEFt2 zp^Q?U8?s}f$(FyaX&YtI4_K$u2?^D5r~_g@HV+AP$spe97t~T5aSFfiHZRHgJG=wi zAq;)y`i4ROFPrtcuj}SBL$fCe`>+e=bJs$$6X&x3o%upLbFwdX`-|`ozb#t(+hn`8 zKZGaT4Y!*&xW_9c#4|jPJN1`)mW^k5)@!?ygfzalK5svljVAyfqkiwVfB$#APw>6x zyMd<^zpLXU_`Cdf@FP$(!DDRlm4SrU}jXx6lOQ;iy$I&-e^`4ebR zH$dGKHF^|j(xYf_yoLDQ_4^laV83?i(zSE=a2>^q7k~L8MvUVxW4ctf+y$e^C!2wE z_Wb!Xi_R=amo|MGb?VcgL30MO8Fp;hvuV?Q4V$%V*1LJ{7Ofh%Y81nX4<~Ir_-P}{ znKyU-9C~!=%r_f(V*NVok58g(-Y%O;Z7Six*M2g7_IUN{&#!m?o=O$?@gcfoc>g|` zw|@8o^8X(|K=>Na5JU__M3G<=3?`Ze9egmFXP${h5=js-#1KH_GDD0p#vqF$C`25Q z#1c(B5k(TG5OInXp;$4ju+UmhKKbUm5k2(Gdv3JSfC#R)Aa9FpNbg4a&OGgoTo1qh zCYw|UqWZ{UDKpKK^ezaFq!^-$FX$?yKm&d81(;uiVaAy>o#}?nZrvhomDXK&f%R5iblsI#UWEA-*kFYnme^u}6$e>l znOT-uX2oG9*=VJm7TI#Fy%yVS#~FtlZprx;+;GJmmt0TGJr~_{)isxsb~&L0-gq;~ z1QJN-try>XA#tRUMjWXJ;D7}lnBam9J{Vwo>QOl1h3$D5;)o@lnBs~pju;>RiSgN( zXULIv?wy`A}UovNwbkc`n$@Kh9Ep8z3Gk#E1YzyDW{&In*67yEO)A@ z%bi+dsHoELsVb`)AARwy2r_7*E3ObrBfl+ry{s7fwvUW4^n**T+zZR2ufKX140yqI zN9?dX7-K9l$sD`vvcr#j;x!>zOOATrKojCKB8yCt``Mz09{TK~m!ACp(5kP#xZ+A9 z?tB)edmsMzn}cn+*pNiByzX^8ulx3J{2xa)(%V9u6b9V+ArApk;DGoNCIcmCK~00u zGb&^u4ADg{9r{p3E|MY-eh@`2x&n(t)H;XAXd>egAOPpXzuG{@e90+aYrJP3D|M$f zM-qv93Rpm}aL^;#u^$divZXGF;SRhz(3pH-rZcH&O^d zWbsf|{02A})hI|kN*MrcK$5?aq7oiM^=pjkF2WI9{IS(Uj4CG z#uDTphXt)>9dcRJQsg4D)yQjki(HYEq`1~q$#uQUUG0LGChw&$eff)D|NZJ0%Sc(u zf;~)NCsXArOV%-wJAZ>o7&8lwlcg8oNi;w+)x*j)1mHe4Y>~i9|9J$_ziI# z(P2r7sF8ZwGoB|IVClxG1vL0`bdcML% z)71dM2td^-_`XM^{v8!JL!IGLJ>yf<7)O2VTOSIl=K}XJ=LpL=|3X&fht;k^M>g28 zpLblyz5T&PN8}-od05z1_zdtNO^Qo@6u3YzIq*ObWYB~pNI?r-=z9 z7n7JsLnhLWxy%MN)0xklL^L142u5se5n5ZsHL=--ZE~}lXA9?!VM0!=fYgUj!W&%q zme0}(E+q9VAx1c2k|N&I$V9fN+_oZ7n?w!`YxvwleR5EQG8D`Vb?D?mXXUI=)N~Qi zXcY>}w-avEql80Cenv`ClNQD=d0FX7TWT1?*a4=Cktt*xBZitt$+nmO^yqubJee&+Bx(y?O3C*zqKOutm#RQWNEFC z_{^Dr3=zXz>uT4#9tc5*P*5}&Wa0_}HbWWgP<;w3{{_W9Td^%_(O9N1BU{rNKHcNd zZ!oKA^JtbfR+^0tKN4Ee_OQtG>?~P9l3Lz{iHT(T)iPo$MJm1n-?q&y7JJ)oF78_% zVifK-hgn4c<2FntbJr}wv7pC)^U$`DP+i=a| zvGiYhIG7*~@yJb#VyUTk#Vod3)?mD~8iNhTXGps&h89*7R&pWmxweA2A;Ejod;TL`Zw$kKLW(!X8&9-g};B?F1MzBxz&9(+kQ3?)H z4i4cG?ox7rQ{t%MY{8DEE01cy22I5V|0&M8QU#AL4hUl<<1{Y3I8Kntt64%0y+*FR z+^ghFE?nk|zU0fkGRX?}OOrI|#*rKOdUGR!`7i^q>gBqu$I-L8lme1p=;ux#?Bz@!p`i%sdVB- z$fAS{oTTmCF7NE=$w&gq?(Rr}AQMeUaVRQo%q(&qhs!GG@K$l5$Sk53ukm1Fb|PlF($gWAs_PXr|{k^cOLvUtR@ss}VgBS^q! z8nyAXZiw87P6dx^ja)EOVh~gsF1n;EkD5{kC$5gFD+s4@2zTXIiqHsy1ql!7S(H%Z)XNE> z5WY|@T~v99}yB|!pFv`B=G}E+6k^g@yHUb zp6=;1q3rF5j1=Q$Ca&yp1PT>XQ7Bl^HaEv}v~2PI$)95Jq9kG5VRnRB=Z9_ z^CsOu0t$#|)do-{|GVT4SPK!Ds7!ug8R)Iv+N35s5Z^q|igHo}`J^8F1YnpnVEj!U zO3(y9kc?1pC|S@bF=gT8=(!#aRd(X6vr;QR&b+vCTA)Pd#h?p@llE#I={=5j9U^1u#8WfJBuBdiS@wNYUyWBf8N7nSFV?ob1h zU%aQO7h>oW`jw zwxSYWbe-ZVH1QFhGLaLXu~_eJ{Ydj~Mvv8I+gJ{u~R#%1WCS!e7@5f#q;)T zajhq#0!LjEeN$-lU3fQc02SV4yTgofJ@> z6j1EMw|?scg{vEcQU$eiOW&wVookMkGU6r<;`A0O$&?3C1x+tbO}&dve`PC`1x~$E zTI|%l|G?!5^_0H$lwJCCE%^&jyRctE=`9JBP}_hm<1m*l6;UY_FC~>P??Gcwmvqe# zQxB$7HPsI7&}QtA57l8EZg*#DH|k6kRUcCjU6sWQahkFw5wWROGZR-Ikt+n^GaEw4 zh^#)8RqmV(HM3-Tk<}xncggYzEzqoO48qECq9$mwa#V3!SCPx6;#P8GLW${~{;-?Td{K}=N0>|H__~zTq5$M z?M3F7eyy)9UU+2t*P%nt&jPqQ>lHEz*cm+{U(Yj07&tg0&0oQBXfbVqH!B)9D@Bzm ziqA)b(=n=k&x0A(G#s{loP!-h82O^0eyCVH%0pw#s;oA4g;mH!ffZyS1BMYuhWWAk z@Ct_;BtdW(stuBdec1fW0R8B0h%;0d^-h2sg4R4MJOVI8rNbJ-k*J84dx|6^-{X0k zSDl8nO2&=cA}|jquors4jF*8K(pZhx*hr5QNdpc9QxKDIRN%?r-|NPjv06CCz zK?d)3DaDj;E8DVruvGx}k+G{P3zw3S5R<9JPOYVrJsFfy4qnXVEJr!NOu1fESy1Od zE@iuO;}UFuB9?QB!W2ejQ0bRh=^j+q9)g>=F@~2XHBu+_w-c=B0*035P*Vqnn5X+w zk(mye8M~eNnS&-B{IGYYxmB;(YG5^M1i^T1j1g`1o4z?$4Pq_eCO;~1w0!8TMKf3# zQhGVj$%0@LoeY5oM|$^eaoPf0M@M`gCnrMZS_iLu_ZiGQ=UV^S%D~q*XEAjwVmJ?) zekpG`+hPpX^*JBfq5qdI=2bBWxEZ^^fDsK}Wdj^3xI{S`I2>5g|E_VQ!Of(FD7qdyz$b z)WcM|sB5!bg%~g{k|nv4FBy|HnQ_B1PbF8iH;J`dn+s!3lwcbS8-cc6nR8{;wu6EU zDMnFIX1Q-ExQCm#pWWG2*K~1t*=wn}E!DZ7o0K{=V5r;M|2NgT;~~4pJ-deq9lHD6 zLF~I5WK|vHX*wZlu&!!ewO_Q^yp6Y;)ut`ho4wgWSKsC{+rpeT%ax7A*8L^ig-8?S|v&d zt`R=2JOqC?&lpKu#7o?GlJO4c^*Rf948mZ=SI?emLmXwCLhE ze9hUMCEQ%A5gy@J*t5iX9gn_XJCY-74{1lz&zBY#|LJbfMNiEI((jt3?LuL#ro*pG>FQsy=nRzE52mIf!AvMoE2WuLnG76)79 zRYoDzafKI(VF;HYD?$5NS6uce=w!{+o?O;n~vP;A9qJJ9r7Q<^nc`5 zm0JKJS~PM4D|zx%DPclN3@J@|`0$a$iH#Zwx`?rj#xoqxl=)bO49JmWN}4pOrDRH! zCtH#Uqa|gSnKWy@q*cO5ajd-om#d`uVNU5a<%y7YTfdGyJ9Q&QqI*~V9QyL* zK*oa?UmkpV@9f*Ve-C7ObM4nrpkQG?zy1~c`}^llUw|xdM__>l9*AIq3KD3Zc}g|7 z92Hb37lm>YLWrSx5=JOthaP?iVu&Du{}ohCz1`u5AAqcw$BHhp*dic?%!mjgirA<~ zjymp`V zXg7{N`lvUOPU_7&mP+~#IGSoI4>T5E>4ofVtx!{53amJivk_jXnLjrQhB8yy6$tIT^N6IR%oN^l~Yvi&< zaLH^KNUz#skE=NEZ0gQF{|t1{LJv)J(MJD#Ptr=?gEQ0iB>l9~O&?8l)mC4PbU>yxq>*a?d@tI_add&fV#t!}r~Nn*%t(f)_lF zKm#2fjY0}B1X1G?J$^Dqf56PqNS2qOhD$BQv^g1^yQD=JCGAAh=yU!=dKf_Eq|8W&)Q_7AMi9$g}78#ADNn?m{T57S~k3Va=?Vp=({)-Wu z02*h2NO=%>(!?Gz#V0;vYM^$EpujUBFhghx4|<#f9W!aLOb*Nse)I#v|A_E9E*O&w zTwtI9g=vK>G!UEeL_rK)D25i=P?m0(rJP8}d?gYcZ_JRQ7`^C4t65PYel#c^DKSSs z0#cCtfQKR(DM?bQq7|>WB={9YC^*ES0UPwCFfPb}5!@hrXm}nBwJ8d3VqHyqBB$5c zX-P25)1JEU1u?9~{}44QlrIjIs6{!WQM{s*Au08aN?8gV?~s)vMfIvwttyg~gw-QK zMXOEaYLmR`B(Q*0tWX*&S;}J8vZ94bXJKoVti+bLzBR2^QY)3{s--Q*)vjE+D^c?5 zWxak$FL4ZGn8f^-F{Kf(!6EEm4r?aECI(GUa6+0FvslF}mWhpxY@6FW*~wDYh&ixq zWiZo-8)&wMHfV1ymdjbscoxZ_y)$d{tY^`dhR>);O`lGKn$zqF(0~fm9$f1g*>Hxo zgesJ5ZEI*d9vZi}(QTr6)0;&t3OI8NZeSW6*gzB}5P~F5ah_-h;~e)miI^-SZRkkl zNFtJuXl|yR|7!_MOp>}d#>tJS>nZDc^1h%pWhqYy0`7X}zRw8NPUaI|O2*>7#js_a zRQ1dCu8P&dP?dX8{T}$j=Tx$gPbgCWDrU~A87Q#ND8Eap?BFy%)0p87b+BLl?l+s; z@NcjG`_24*e4n3iZIqb;}!SXsdhJk*lQPB{ID8we#Xo*Vn zkrRcKqC1!YfMYlkRj>%%=rXA*T>&a>L9`SqbZI=?c>)U^xIoH&XS@`|Aahi^Mi1du zr#t1$|4_8@1SO4UjZ(m4UinBULm}!If+Xaw4tYpR33!p2^3)|CS;+)b^1!poq^35B zt4@0ISIG#LC_|ZxW8q?1rEFFzQQ686ix`&Q@|G;4H41c{Yg{Y7rMPsdu3{{Mm%R+6 zFo4O7d*!&8#LSm50k+X)I@6iagl5Jt))0+t>|@;QrZ-VG&X%!EX6me}_CSJ`dbo3* zK1&tOw9K=Ciur0w+ZjI3jAp6%bIfdRGtsz4&^RM>p>(dZ+O`JKhf;LU6}_mR(~;4R zmLt&R_$Wa@ijagHq!K1|2uf30GRaY{BW$>wOlgYgm06mhMZX=Q5M_kK8{w$9i7@VQlPkqBSVp=mzasFgOYsja978JvFTOV@o(#q?y|-nr z&)=(+-^CXS%3)IPhJeRC5-J$_6$XD93LJr#uzj7ESHDXg^m;Oo>7e+)BmIz@MoYFQ5ILYV5Ua zuP&#bUatCvEc=8r61fsXBrV5=P|_5jfqqihA#DOiEks5&h;!}nSa_0M65?~GGk!qjJMz^e zN>yJ;R|taQ3rq({iNXv}*9_di4TUsyhE#P{=XF^JDqB}cnfP^^@(y7qc4OBopmcU> zS1fGTVQ&X_cSmA#2aB;}ciQq{Dz=D>{3_k0c^eJW)U z7h!!Zg?*N@eKVzLnzIssm{V}1TW+*EpGJPMCRAJDYPMrL@3(#_d1@~wJmoWM$yR`8 z!GFY7RejNGfMHbth?6$CRdqptXz-H-h=5};R!6dIIpJ)Xk(64|Y7Pj8J!EaYF;^6r z8>>;38(3E!*nuD@g1|w7z(GLhR&R%;Zz||OE!cu-B5(6{|ALK0gLue5`G$l0Mje{P zgFXmwiB)i7vK>X}m#0-Bd7@o-;&89UT2F|Wa(G*|Wj-cSKfYB&UFe0vHF6_2hGTeg zet;Ti7#x*x1#JkLh4^wrA%$)-b9H!dci32ZXjt!&Mry=|Y}9k?^?jr!h(Q-6MNu4I zFdKrBU%oI5@1iJBH+Gdsbydemo~VhO*omI#DWGU65k`t+_erOSio&8{t7uBCs7kRo zVzQJiv&fw+mW$Z>J>3(NLm3m25foNzL6SPSyvs1mEqPuAXsi-SsWx-9H{n1l%+ss30m*w9o?aG z=aoijqHe4Sm-$vk4U}1RX&-pWS=2#rdl?{nNra^Jmn#$n3=)`3_;7{Ugo=qJ7N+zNd z#Fj54n>!Swa&nukR&-B76iC+vy?F?~IZT1HD2yVB{~0lpmoXs2G1J&&25OB6S`i8gGc#j)RtAn`02daTJZXVt2N)9| z3ZfjUv$4ldwTH7fTcSbBd+k6rC~CBOwxTTBqAuD@6Jro1wU8hqeGh4)*XI!)0aH4v zwKx@iaZ;N<$5TQIJ5I`!N@Yc4`&Jl7|2{BjY(L37>(o5j8R?aCg&9%k&17K1wtQ$0+^bYEKqPkI2|VhyV%jWeHp5yb%d*hs!I5TQ(q~flwqMVs@i2_!y zWLIJNx^|?*udL{=0Sm#aM6d{J|DNW#3%u}m42!|X@C(22p1q`FhG%%jc(L~>4dPG^ z$V50AOJpAVvD8F)mzQ}4O2a6-jic8x<#c7>7_(URvS>k}XR#6nc(Xt2dTNGdQNvF= z`;Pgf#70byLMz3+XS66fH^avcS)8uDhA z#^!^ztj479`&@4bfrkq}Jz=IUiGVRllW=<%!Zx>bD?Nt6J%|yMdP}Bj>$gC)K7#vf zQ{ifbJ8gIT6+WT3%LOQP3c0oMxV3R2T-m3=ak+sySOvtpWI30fOCO=Tmd&B4H29i~ zD!!=8L8{Adm+HE&J8->x{~etR%%LSFxf>=9!n+jGa5iL^vK72-WQB49tGxvXF+!`W zv4t_Ryfcyr&HKDF61^z5TxsZB*V~4M3mPFZtyrRJ-CH1_N+9f(hiCMbrc1uaj9%s& zw$*yAc6_!-$D4Uj2;W*L^~;{aNv`>uzuwRdm6%BVTfqMtD)k@_0o*F^3Y`V~4hQ@w z+|Ufl&^FmH73F}op>gU(}KgoFY2)% zt7IcP!!>Nf3YxAlWb7TW>B-lOib0Y2aoXx)onJ#TRpT@T*Y#e z#q6-fT-?RW_r((v|D!VsX%G1a);EzKArfdzQy0m#oz}HKms5cV7N?d}Osb?#V$Oj* znwPA{v-XlyntyDOr4GuaguIhi1-D@eltM|SV!>=f;cSrH*OGj;aCpfyF{iNFxO?@< zk;|3j=9PXbSf`x1_FT)ARhFzgAlm`D@A1myrMb3jCN~({+F>7-`rCK8%l+Y5CnUSE zOS|s;%R@-a3xdqs)w`_4A+goW>ScvI1*@8=A}In0TUgDJ*+hn*t0m{nWtd!N$XxG5 z&e;1tRB$CX#76PG&g?u|W@$#X{HW&j9ML*oJU5%wTBPl>98D5mMKJ{boCkeWD8VVN zkciL;&A*6*|IrY=i4#rH0_=5~g3*?u(HjkkAZ-k)sGV+0#BfdDK|428y6WUDWE-vUY*gNgb2N1{snu7Fpe9RSo4E z+Os|*)lLpjT#e;*=GFh0qU#XWV@=jwoRA9nd}B-z7qJL#eFl{V5_0Y4qQk~P$`fsz zTV7%3`z$+4I$d>4xUSZeg`2%R)W?Z^rHXxe!d4hwnv;UerCQ2Wid@-!OCk-Z8An3L zg*do-{)V0L*`om*rXjgh>B$_(KVmSsr%gXy36@@2f_YvQZF$S9EZeg^+Yn?Xt-0U2 zt;&;1|0cej%fH^bA=HDL6>tHP+_QV^r1iP(+}tj7%+Xz#znhp&sH&ibzPoiA+&v^K z!riUmB0qAOJ%X9!9lg>kf;sV-dcNM#1#9p9-d=R9r)eGuA|SC{mU#HuGstkUna;%f zhgQN?oSm(7G!^y*&=R%PiL--kSh{2$3&e!wd>rwyfF0X51V;gvia?M2ZzF|GvYR zQR7B=9X);o8Pa1tk|j-^M2S-5%8wgec7qvH=FD!~wrxw6Q|C^e$#VU~h0B&Lp+k)x zwN*>$Ql?5rJ%t)o>Qt&#tx~Nus%b4^UA=xKR!r6{V#b*qKZX=p@?=PkEL(1rS#uoDo#V9e+@{SM z(xpk4DYFK3>N051pmrTwHX1FoY1fXe1@~>;y?yt-az%?h;>C?0N1j~ya^}sO--8}q z`gH2mtzXBU9lCSw-Mw?C7he2$^5xB+N1t9j`F8EyzlXn0{yKK`*`>pu|6l+9bmsj3 z2hg0r1_bOd!YDy7!2}_Bq`^lPX+#h~{t&H=GtO9TH8M8jutN_&1hK;~HVmUg6Hi3Z z#41)?QN=34c+o``SCoQ9DQ?6uM;&v70ty{_>`@9JeH4;MD54;e$Q^&gaYiSrxMD@! zqWrBl+h)UZHZ@91!!$2Va|28_#w4>$Gsj%x%rMg|votilOry&<<6I++Ebpu`&)=kc z(#9R92olF3fxOYjL5D1I$s1WLaSSoUFyqlX>Y%iaJ0`7Ej5;KJv{O$%6=MuXMJ2V= zF~aDg3skF6w9qJCeIiy_V+EpCTW_t^h+A3UwO3z%1vXe=dDRtH|6^}`;#g&uWfoT! zng!z7T8Hfw1r&a@Hd_={;I>Yd3Rw+)f(nHfX1HO89iFkoh+`}f(n~M(BV&^Tj2J_f`P zkrN@gWRpt{B;}MfHlyWGMTPQEnP;ZCW|~`F^u~vGUiej?|MeMQe2Jx2*l2r&HrZO0 zR@zuvm2Db`S%3C<;TT&?G3yz3v^mfriuj_AJPHwrpkdldNTG!yV%s9OCvqunjaZ^P zq?GPXscyaH&WI+zYpRK%o(4CjaKnQt3aO#CV%({#9)~>g|EQeW3aqcn!n~McjzLSU zw%n3SuDa^Vs~o-hLY+Wz3_Of6*I$P$vP>wG>@v-6k0UeBIIHlp(NsIlwAN;W?KM30 z#0`1nwFvHt@1BP~dVB7fUOVfr$3FY&rIWsU@74o9eDTLO4?gqbTcf^8d0N+=A zK-LXYa6tzjX=ITJDYWpy3_}E907H~D0&495|Yd!SSTJ*uz@;S z-~yLtr8{-7OKU*GmqfTGF}+DmW=a!j)FeVU&1p`vu@jznvq3FXp*I<%;1qNS!3Z9z zhc#mo1{>w5M@6brmf94hK($0BhU#UeA{DAqRiXw$|KSO+BABe8RWvSk5oytaRv4oe zMl$Y-S73Y=7p=vDYw=23+xpfU!PTu`x!_!O^kT2vrN?~r(U16=l@YL*MMBOBVFeQy z&lIW145A29X1Ex~{D85HNfHo#09nXHW{8uOjFW~?*~%u_GE$OZ3|)}I6}q-cRswNH z46Kn97P+%1P$6go8(JQb1}rf)Em>o<)zhSgD}qt2mI`xH0a4^9uJv$>}1|!Zx+zHNeDyOw#~O$gl}@wo8Ian54@F=oZ(!_H~;oGhcKiWgWHKQl3}>QiDf8>Q{3W` z(m19_&Y%B;3O~8R6|WqHEWE%RTF&x0(1i{z|D&VJI8KK;zwG5N<5=DN4D&jU#*TKi zb3`LBb34tlIMrEonh^n_GN>!@1)~X}ja$sT9|7CKGcC2ER5twCkmb9XK#%T>}jc&ZIw&wUo zIL@(-$=&0x+V!qKme-G0+!uPY_^(2?w_vk`FT<*U%!rxjk&x_IekXaUOltCziQr@> zK^e-8k@96QVr?rGyx_pq_e!BN*e#xWlSX=Xx7 z(v$A)cfxxqZ1mh3nby?L%mWUT|4iFFLhp2`hjz|SlS))ZH=3x^L-cp(ah#}DnjTOc z4|K?*X-kWTs-JF$ecZ9WtmbE{Tw}+>Oa)Dl|yfhYh0CiBD*eg zuYASY)@T&V#a7U@gheqFg0So;2uiWV_G<=fI$A7&kTkA=(`QxqB{HS3O)E?x3*{7A z(NY^rrM2N{pQJ-rPT`q8eBgo;l_S~qHn+FE_oJX_sxF*LimAGh0u}W$LL!S<6-Kyp znG0QpAKX}Jr0&tYxJK=QOOD+I7q7;ZaBA6WUgR}z$OYLi_mF10MW9|H_v6)<_Hny3HDxa)m`$Xno}P7cbmlU($-h!F2jB`}H&V zDlmb*eo~2{Sy*VMYMLxI8`{*iHW|y9#y^f*k6E(gys6zIXn#kLVGQ%;v^GVs>!8 zjO|FOJCp8CrKGv@OI7ol;+@+{fBrL-bTjBe3&+sK!3RDfy;Mi{-uJzSbnth-oK6@2 z(wWBerJN3j*%5uLy6@BgO0}vpY9Llq!a?~n>mSg{1~y=*t+mcITy;aD z5y|zg20UP6B{pnm{{!~eGjr9?et5xW4_kvZ1VH66H`%y0*Vqzm8=-Iu6U|yc73#J( z;jGUhw{jc6nff!-(h+wn5_oH+{WBCH>MbJ5w<5Z?eKW!M8?Ggxnu1%JW=Xo_nwF$# zIEITjTREeI<1UQz7C4e4?|Q+a@wgxaIgy(ed6^ek;TH*;nk78Bk|Vl?nJ@WDCi}7& zn6pBe+oYN!nE^|gKkx&c<2f_vHCPI|LkWU1d^QKGkrhcfV>-Hgc|nGYx>yN`#iWMNaqQk9Bc|5ymSyE`K@27Kzfqxie55WH2KoW>!Be8L>YJBuxIytNPp$csGEp}fkY zr~%15jp97T_&hk9jL-|c(c_HL>kQFgp$wS~-GD6Q2@c@!Gbo`(<_Qi#tG(vYjpWF^ z+#?R%vj=e;KJWOwb417MDaYn8KBwX|Ok=+A(6o58H0PtL=o>YB9JT#$2UEK~RLj1v zsvlQ#kVP;^SwpJ~(U9~Dpt<6ZT^lhJY^3?i8EE67#7eLyfS@2j62v;O`fCzakv7K? zzzVE31VqVgQ%P?lp#|(V37kNa%ncf{p&IIw)gm@PLALwDKf;2oMF}x`qb+FQsu)S3q)N&!Nx~$MnK_y>87>s1Q6eQ#=>i720-Z#|#GD{S znXeg%FM`7*I1DcsRJf#(I)E9b4ePKxydt3au(`at6u}`Tv7$gMu4ap-Lj=2mIGeO_ zr$;Qiw|NIioW!}g#F5BEO>{dO>%^LPh=#ZcoFE)hG#n%|#Zz1yCu7Cs1V?Zj$8}6J;z-8=HBjpiJ^{6db|fE8lSlJ#PzI$3d%Q<| z%tz_NM}PcB>PjYwM8(iSu?*3Su2JFpb{aGhZId^>XZ4K7!oVC275OY8?0vg znPf988)Zysqam4$jcZHEA@!1%3^y?Ok`Ed;7Xs4Th(_hfAa`4l9SRgz>dDqhLk5y9 z5gfrKGRmU_Hu}pE9QBu2S{7>wz!zC0Pg?7}Y$LsNp8m`Th||4out zlBFm_rpN3|f5%>mN8KYw;{ebA#n?mpsi4}91NGPgO;DZ+58{|K3AME7*ff-t zPztS33w7D(!;k3OP!3JC?gT3bVFXw+E772}T0_5EL(vX#$Q5Njh|H_2|KTgE6H|~h zHvD_0C

1!O~A%Ok;~JC%Gv-Y0@A)Kq5uJmV`jBC5<_$lQ@w{*qc4(!N9HK$uj)O zH5?)??NU>DA}9*M-$KC#LQN@vOgx0HJ>{Y}72Jc1O08_8ZQ05@ty8evIABQ^jssM) zWWqu^(?M03_bNKMgqWc8lt-ncN5#UK+rmIdgqsV5KghW|2*W7SDNpUxR?*y^DOG{# z(>|3-ITRSCdz#BM(+E@4`szbwV#*T}#Lo1Y6iXGcDTH2S&DMl5vKv-nHCANBu}jQE zW%V)Mlsmc$&f&z?;#9J2P0nuhRw!#uqlkrKNZ<4o3(lbhawS(`|1eiz2p#KO*NG~# zUu2zml~?an5KizYV#HTuth1C_Ple>O3#3oln-Tal*n~~khLwWUQY9#$(uUQk;1CrK zA*KKHV2b@liam}HzF4L54sx6hqw3g?W#L9s;dLBYlMSDEj8J)8J{g`+mNlQ3<>8o> zS$CLO0m;7Y+g}AC$Pg9L{-L!F`PrZqkr8P>C{|HlbJ3&4D;Zs^2K&Gb+~OZP!yT>K z1mjVhc@mpko+d58vHc(-U1K+CNwKvoazld{qBgWuTPG>lf@PH+akqGL-3AlM6Or3| zJIXHwHjwOF4MWq1lQ_Wjm7^J4VzSCP#lgev%5LEl3s z9J^j+txaj=UYrolcq*Jx#5*e!-|^iiek$L8I$v9e1@w&t_KnWyR48-(g>$Xn`@LT> z)8E7RU&Zj>#CS9D9N^4YgaTg13c)k>e9{fd;M%JKcVoB19BB+5X~WW?38qp$PT1y| z5s2lv3nAf}wrT&Y=@s_Ii|tQ*hz_7?;h=Uj6;`yK|H9#@iqPv&J{;Cz_u%0kcG(~% z2O;jN?u1t(22l}3NCa+TCzdORjN)E1+W31v7+u4^vPi=UD$;Tv9us!_@KuK&J3XUET zG$|Q_4l#pS!-F#z$D4NYCdX;&s967O@^H*pp~mu{UMlif(4$@tcoYwKoX0Vj;ih)# zr$%#p3}XKnVo-2%P%!aU!&$8+Q3UpC5P{;*9PeuuF)I!O{sSzk-ALAQws^DJi(IV6 zD&xmOW7nV)zE0A=KGHZQ+ZP&aa|74~|6(_izDQ5a)#kps$j+^O3qjxNH-8h&6kM## z*6cD`ZK44JUAe)~{#&Z7F49hIOg;fT&C_tJ;Cu zq`TBhT27h1{3O%$LQGvP3l9%*5g&0hdsqII zXayO@k7@)+xajjdDQ4`~j)slb|3f!*Q`o~yr5)d)AJ<6;=5!PT6b;NqM%iEvPVzIr zgYf$UC+GSQ4o4{`Vce_fMa%NCPsfn$9xpGxF&Fb2W@?=`^){V#T8~q$td`Q| zmR{dMUeDxT2X@Hy6=81|W?tsnc1y}_%kNgyMRjG~e)ebAOG^R-m7#V^JzdoGDM98W znGD6Sqb{Qw4Qnl~U&D^=y2_O+TB^{#QswrPDN=e* zxdLT4aVS%Y_Z}`q|H|;=#FtCC0v$K?Dr2sbF_YblnKO9)EL!vjJihYg&!bO|?;bvT z>+ivj&t83cd-mVUhi@-G|Nj2}0~nxy0}`m8e)b`lpn?l3NDn>sI2fUX6H-{Ag%@HN zA%70uLl1lzf{0-|Ba&F6i6y!-qB|?H*rJOsu4s-s=FnK9jWm)&&N(^q$m5Qn012dH zo>W%ZB$GVyNO*so(PWdVsYZsBWRx+bl~-c<8W~|o$>o+|a0%v@V3JuTnN^sXW*E4w zIURIw!Wk!=P%Kv*oy^^dr=5Aq*{7e?Nl~4kvJuLfp@$-h#u}`lhFThpLK>;0Zb({b zqiJA@=^C11|C*?$h7ua;Yl2cY1#ZVBcjum~vf3)2e6m^Qb+ghs2AS8%+QqGEjzKDJ ze#RMvuu(km1hK^;`vefnGTW@P%d!xyw9`^st+m%$`>eLxa@%dU*iwsvwJ4BVF1ah9 zo9+tcu4}Hl?y8He3od|Lue3(si!TdC?3=H@{{kE^zQ`JpticCAK?TAKA56uu2^UL+ z!%;|FvBei-EU}Fg8+r2%NIC%yI7&F-Boj=A6Ha*GJN@+2 z-bB%jlv0yF3u4Sj>^=f z(C{crVbM}ogcPSVwW&@;5m8z|!}MZ99Ve2iH*r!G_*jLfCmb}kzv8X*Y@EkPnOkJSuK6- zE0q0O8Yu^suVNK!VM(JJD;b6~iaAVTusj;ZHpVfJg)EmND;dgCwlbH!3}%5C&&Y0e zvsvM$jjIZRGK(mut!a!pTdP7ek0z{yt?~(_!^-YhCR4GP~Ld<}ip^ zjAKk_LdroW(`~KiQ`GNHj`qLkQ#)_W+qBX5*RVx7r=%52aD1vgGtA-dz*9cNDuOvzl2K)M= z4c@3nAPgZnMi``;+LRKH0ILdHSfv-nP=->PA(^HWCLHQ9k84urna=bzCCX`4(ErI3 z6yS)bVHL+uq{UO8e#J+2;s&X&3FD!n_r)zZOp~oN3npEylT@Hx&N=^>w5cJoo8rxuBFme|@lK0eEU+XBD2Xmi zzU#g2T|u=v$w~Cyi<_bxYj9{bA?)E=M3um4tT(7YWa!Ptn}gE zdRD#GSHn8i1ZpdSBy_;L;u?Y<%Jp3JIzhhz`>%jC#|L*b*dG1!O*MceHC9v2vhbwIGUn+~tn0oM3xK*%lX3of7V)uBa$1 z>ejbh^x|#7SX@Zo293UAZga^^;ysyGPjNI~*Q!fhGhw&0Ii!yHK>vHEt4U#O?_8K5 zX^h@Snm6PfZ(1a!HOY0&7rvQ10m>=q@uul_zx~~2j%yA`R#wbl6cd(=#e0%^8==EsLG@f>2J7$3S&&GZ>s-hz=2~`p=uRPr zZ8=>K!`j-`izLTw$xVJT-76Ahj`WSn1;sMo8%pIZ_ki_fnuYR(gKJ}{~p9I|_ zLAH)7ue@=A3OaaG%P3(YeHwc58BbD(zNS;?J#J;x_O-AblC~+ zaL-Af_#V(4k@(mNRrwwg@yQao+Y^Nf8O0l-+*ZGtM!w;j7G=?J;Z~+ZAOs#2Qo+`w zrAp8o9KsbK0m6xo(NWh#T(@o8XDyLxtrk4p9LGIP*VRkR)tJaRi?ZD}V=-6dAyNOVI;aM@5qgqJmg;T>M(keT8wUgvm)Ei~Ta ziA61hMdV2yN?Bg!Y2N198R%6)V2oa2_!+a69-$dpBRs64Hl1pLb8oe2^9&FEY^}Z$r-qi{YfO2 z=wH|9&~$a%XZ=b$0brd3AOaG{xe1ZN8PNhNk^j2|+yi=G2U-zp43`xN*9Pj_OafQG z`P;vZ5v0Y|sqkboG8a|tOdB4c5SgS3R%91=+eHEjM{ZYfT+P_n;K(6i(|nT={NPpM zmwH{&5DKBX6yXtCi+$nX63$!{g56na93NVti-iFePFKftOdWV3FOAHFiQ&qSA^X$} z(}`G6k{BD>3DrSYo=}0-z~L3<933uA*L~C1p=Da~Ar@97#RZGm{1H68$vg=}9pnKb z_QE1A#4$8t-9#eYP2%2UqCs6EL#5^>0$!AX;x>rlQivH;WX>s~V&i!QD~c4GN#0w? zBI~RaK5?Gxd>)?dVsh#ZV?c&4nj<9W6#p=$UXpOeB2=gH!~ydx&oR1?qva%|*~a!@ zk5u(utBha?P6urSiZ*iNtaOK{c?Woe$Eh6&Iu;3YQbK&RnybAUJkH~P0%-s2$AG@o zgXrUdA}9p$qd%%hKnCOn5oAFcB>S}=ej3SQfz=8<36xA^mQbW+Wm`ph&1S(CxG|*< zndCLfc6T*3LJi#AiSxZy~q zXPLC1n#>c4x?2nipmPyNE8QToOl3DU=2ezg*KH*w5n+3+0L!I|m{O8hQVW{C99h!b zV}hN+G)#9PCLHb%T+U_4SlC_SCI2yv%!h&4tUR3>9-Lr;51h>D6)I-H;9$tPDUZ1& zm|&zuQl=lB6J(~HW**`p^ulL`rreQcX+GI$Zp1rKVrp9AYWkhtZQ?rs-r#*AC?-QF zieha_MVXzVZmPvAjucsVlq&uv<;h~|w2m*_1#xy>=OL$ZCI(_CWMTm$PyJLQSf{iW zV|H%mX>=#-wZ?JjMz_*Na8%Ebo~KZ@N_u7$tw@Q@GzoXKκ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 y;e0l>hrbn+r)v`37eo$plou13bx{b3k;1 zz+RC+Veu6TtUwFgqj}4uMesmsIfHCrL`Hl>VndDK>Bm|`mz0u4)&QwWj6pIO12T{o z^csxn6PX@vgH4mgn<|+j6zIs1V`wH zE1XNZOgSyQOD+^9FH9N;14E@*2f#E#G{iZS{4L-*OvF4)bc@3}yc}u@IfV%ZssF zsD`4l!f3Km?9JWWyL+OYzgxvm1dH79s901yq?|=GJIdmz#VeVTT+GE?th||`DgUsl z{h+DK!?POj#p_W5@f=V4D4+8Yv_g|JM4QHHY){s^#@AbrukyaIY7irNHQdXzv-%JT zY6G@95#UqDxSFd`bH^J2p}c}e$C^j_46Ep?$Lhn!>zn^hek95S`Nsx{JEj;&f>a7( zyP?x)3x;G9BwDs5;syAdNQ$gTi}VwWv_Fkxl#ZOyNBKyQ3`q)mhi}-?9bG^l^--35 zKnR3MV3|ppjJHF)Noe^4Kl(sH0!_&PO1wae-Qh0LfJf+DJ`rj`9zi73%!?~JL%|$OW-3foNlZ-5)Zn7SpzE-K5C=~ky2oUQqa!iNtca!q z36ikP%UlVnJ12C4gsYn|&-~1v49zPW%^hPL9$WuP)91Texothv0(I6Gl;)(`oAksRbKnuLU zBo%~35CpB&+6m%G>$)z!ql(T57nDlDTXX+T+PKnl2{{GmL5}9bU*P-bn=39}_arG0wFMsLpWB(fPz5vM0&t3)GpiXqDEydmS9hRpGo= zEko8Y>!{Hn-)}u%)%dPPk|8!L*XH4#ILp`i0Y-JjA9h7O`rTKlQi6VU0{->icoom` z43F~^4`w`{;ef`=Lo|N%R|j?l2#){Y2o_j^%_=02&xG|K=nE2tMIZ|)EB$1kiLDp^ ztk~d#s}~_q8Zl7WNYE?s*pFS8#Yqw#U+IOp3 zt4-3Z<=X#Dks4#fGMOFIEJ3o>QXF326x^%zMUXF*g1D7Ir#u7yEK_EgH+_kTmT)il z3W>js)2<|3Q#xEqM%;w)mxVb?J$2koC^%dQNCPKwk67Cnapjuo>{QX<=mn1 z%Seq>($$(YQe9iN<#H1TUDp5Q)~&;ZpeERbh=8Iz_F7e&O*o-^s-4@j0UhVbG({WZ*B+XSUvd$@A z;2B@^9k?-5-z;Tc>~miz*+q0+&-ztYW8{yha$tmZ-~bk2q5_Y4Ej{v(pX;m-{RLQn z?N)i7hD$mSx|GXPrlr_68JUS0m`UXX%gcLkWeG#3Sf12bz8Y4! zWm{$=#5C^X-sN5XIcad+azKaYwnMUMy6OH1VRjp(W4hW^W@W}*a%$$?g)v#}n|eva z8++F3#pXynUSAEeUk%nw6xJa+PUr2M&q>8|wqEOv4D8L`b&fJ?=9YNQjA12KdR`av zy=Mg%S8!D+e{TP&>YQkS9%x0IM*gs~)RU@&-tc}6;Cb~9h#rq#)K~UAXn);k6yNC8 z3q}hb;+>{P`xLB`{$K?PVG&j<5=O@pMqw8rzEKmXyHY-mZ7dju@gj+FSfk+@rqJYR z@(PVdm4&ROW@=$GzpNM_six{L@B;RGNF`!oSl9(I-&wDoVz3?*E0$3#HtX3+YcPU` zPFd?^3S(=Snu37qawrE}(Q^qj(z?FD8^mk2QW3t^7QfDBL-H=8CUV9SDa`3Lx~*Ff zwA(X?187k%%9e?iSP6j} zm1(aP?9$cSEX{4+=I8aY@f~M^N|V5&&9D>r|Hiujr;PBejMtoJdtUGr zEI7d)Y@O!E2mj~zbt-8zXn}ptYoy=%zz?e8aG3X3^8E1bD31e7M@SBLM>{nDK|T@f)XD9Vg@yh7pF zBT@hI!y5TK)@i8@S*4yVDjzne)?ij^$Tm?nJy7B%*6R3^KWs>aR48*7J##cq^K4^t zZgcZ6lJg8h2sr$9aW4lmrrJNpKt>Ss5vto*$-S)S0(&1T#iFr!A+RkC#8bf(@t)6S5Ix#R&80Q zgE^q}TF>=cuR`blnCK^&=2sb90`_3#$qe}DKN262%8H;N-Ymj-fgeEr}5JU0h*2MBWl2NEo3@F2p30?(0a=WAY>!Eh<;CY`Le8xJnMO?tWs1-#J8#0QsS>8kmT1O1)G;>VMBrJMH>FzQoBX&>c?5hL#B(|7+*$cT=m&#-{PAEL5lT3rglAYtk{KDAA;uV8ND%}SL5Mh_ zh(M5d8Hy<$Rv(K|=y#usFXmU@V)5B{BWI)OsAGyfUbdorR8%1(O<@>$B$7y0VPsG~ z(fGuCTyXKl7j@WShaP(Du?H+&?(!uuVcs(4EvcA^4Vr1Hxn`Q$xcMfWamqO-H+9;1 zC!TrQ`3|3b`uQiIfeJb(pYj-bD58lfy6B?tIQl50j;b>$rIl8S4yKuEicUGwl=Eph z(TF;#sFj#{DyoyHx+<$3J;I1bj0m!bAb$u_tAuQ*vFolWX@M3`M{WP*RAW9Gdn~fZ zGKQ2CGoeIA8D(4;2epeV(uk`WRRjvR-GUMdxZ#Q$$~otR+wHmBezGpR?Yg@Oyz$Bl zZzi9Rdycy9>btMKp}ZTfCIJhq2_^+&LWd)cAe=BAbj55*Pt!w<$8YrHYX z9eeyS$RUfoam5*5Y%#?cr_2w^Etf2EKK$e}GtD*Id^658-;>WhJ^TDKJwXdSG|@%3 zbM!h%E4_}TO*{RxHP$#Y_0-H*eKpouYkjpaU3>ktFvEl`_Aq2KQ#RUZtGzbcWs4&X z+;Phds;8jZeK)8I>Ag4K=0Nm!Ll+5-(ME;G3eq1IK5J54jlchd*5hPJj?-N;fd!OI zMkVDFvzi-4)lq;2hLvD`nckJ?o%bYGPm|O1t4wFr#TH9**?v3jZ8@&RSTc!a`Ch^E zl{)dHH+DSo$UjC{WQRRwtYbd1AeoJtg_h%v*_U=2cBw7Ln{2v?KR)^8A9p_b$oZz7 zbI)1#estZdrX6fd*j8M5`Ro6k__MX<9}?yRr54QxMlw2JfBf^G0f_-Y4ouJ;8U!H< zQE);R!cc}d;sfCLPZ0TDPO`XmNNF3cVbK_f!T0LeX4zz6Pw6HCgvqec-bpo;8Nu(`{l27&2nG~`(?v|Da?jR>|qXzn9D9UvSl)}na7eLzc5`a`R?C`)1FICeCpl4QWbKN7B@&PD({hYE+}z*5au(uQ3B` z_WW8sy+$^%b**jw^rzec8aFo*v>fKJTi+7OH^Bb^Zg3YV+(r(^N0KaVcNT@6>oR(i z-es?Kyo#u2cG5Hlx zH=2{73QsS^D_-)F3Yo<$Z;{Sx9`l~?ys4^4gw>lK5MroR&ukAh+4&y$$|u&biZ6X; zJh2h4gKopgeJ^&IQzS6{&pjq|E-4$Cu9+RVx+*xg zv4Rx5ARaVihB0)AgB>){2Scbxr;?C`Euunu20J4d1u=+*ap4QM>Y1#L=2)3oo>XC5 zz!w#1COQm5O@zWiAW6v!Rk~7^wxmQRhKc_eP?VyXrf5YgYO%Rk>>_mW6vpXNw@~jW zBX-M(#z?JmQf$nW8{t^0IiAXns&dt<^k^-SOz;eB_~YVIGLvRCsijLv>SptMtj2&& zreqkyNu*_=N>Zy@n1lo*G{Ol`m=a&4EEg$D31L)vE0^t(S1e~qOMZpR!s`+jFXt67 zOb|?A!*tk*QC!SoR#TeKd@+no#!PCqn8wwd=E<}vvu^S@XW;bNID<^Ia<*e>OzW;X z(c#W_IzygL=Gr}@EafTd^Pg5un?OHRw}NsxZwmb~K^XcFhdvad9Env(MgrfHTy%FD zeY5LEI#Q8-lqp#e7E$bb-<2K}D=q)kN}hp2U%YVib+hwnPF1qgMe|g47=z04hb=_yjYge4>tU68@qsF0P>91ECMmbN6(A4?IK(e_!HB`-l9#~rL@1VN zippJX6`iYaH$}JMd#WzP2bJAJ)nnp`+U}!}td8$;D!gzcFCEQ`M>OB6Ru5`y8v=>%qg+-tV89|M^l z_Yg8UiEQLa9a-a)QZhWP*5oJ8lgfraJlM)Mwkum%ppNe{JCk5YP}lm07uo{zm0J2$Le1HH z%@UNboVB)9esOh8uD$;=o?f@2{`Rl`ufY>+CJb9Wel@mz1fU8j&;m8vvq4+5K?urK z+elm+9%S2wP?m=%MYn+vxP_Yu)yKFYkhviSx~1FowN_+whNwlxjZ9U%3D&$x4wKx( zP&`SLOi6(NmzDtB5;c*SKv8lX9Kx~5!a0}21tFhwL&O!~pI}!#B%u;ooIGHhq^uLi zbsRyF3VBUJ$kh>gX&xU@TN|)JwD5``y@c?Al=8*grZo@E)f}fKM(z0ofa#oook4+J zQqTb%f+5(tcuR!sA<{|MEj=C7t&)bdlD-fk)>WM>4U8si!ifD6!+6~s9MjiDV%JH` z+NB*Py4{Ph9Vh?V*fPz`j>R31&E1dT9o`XHIi-`|H4Weqo-5`P;>DsYG9KeO-atWK zK}nuMP#!~B9^qgfCE(FVtk;FC9O$_jO^IGc$<$9|PDiEQ=8z#$*qQ0{MO36zUl7J$ zP})=knoryw?j7Sw_#QdBMVpaDq)l4!Ar;ImU#6WQRMC)BK_3lKhNq>WWo(8%h9GE| zhW5=5SaHYq;RgQouJPLaZ6yBXA8zZIoq>EPy(_S14_srIACODP-S({6I9^0U0`RCqzaB3zIosW z+6X_2#%2GsTlL&X4bhe|8U+E7&=3*PZyk|v1zas$C7GB)!JP?m^`H;_;By6G5E7vg zmSv%kkrFPUp(G)rz=NS+Tz7F?mwlWZiJV8cO36J4AB}{2tr?pM-+Xz+QydQ(;-g_U zm8TU(H)0NDox}wh*tJ|s(A^;{aRR%X%N~-_x1WLc(RcA}~f&dLa&9K8rXy zjxzsF4qiwOGp_xUZr3IqdR5|L@fjUls`cCmp z+E;L+A-SVcH5F&Y7Cqi0ye-mU0zqbARrT$o^^IDoZQpBj-$2%ecwl5g%HKkg$N9vD z`pKGeSO<1A2StX@MPg)l&>u$zsYl)hNP>ZC6q^8v+W?~EN**8tMNotIK^vT0OtO~) zW?Qyt5K&ZM2x%5i8U_Gv;0gt$P`(gR7UgGTm5-oS3jXAMu%HXRV0(~IPjZ+KqU{QCmybm^EcnaGq;2X`;t~qH&HQaw=!u>D@Uw=f**2bY_ipeob{w*)R0#zJkraQW~Z6tp^oPGPUVnAo8iW_~ahxtuyjJD|c#9C`O2V4E4YUn7g*$+a(D0l#Akf!ag z5vl(eX=)&;PnP5Xp(GeI>4DsVfhbnAImnbw$O6hFO+Fw5R@PE*sh55!5GiT0l^dCs zDUP5ik61=hW`A(T1pza`{7OJ6ckv1SI zbaewaDC(ky5feTt?$(2&!~^g4Zalz4@1{|u$|c^6gYk|76>e&)2;-+(%dNyggq%Sc ztbrPQ;mXmcG(JTc9@5d$+_DTPW$Bz5Tu2+->SXFFEWy&gWM;5}n1}x{n7JIQv(A## zg=Q{2Dob)dj+qR)HgL*V49pZ~yL!{i&>g%k zCv&ReDq@N?WXiolnRV`~zlw0zjIaq;r@vAsbq1`I4QzJ8&E0Hg!h*^;G=%XsEDk#a znMG{oy~=tej)jzgdtz)$Xsky4PO5tBoVDIGW^b%&FQpL$RP>pBc@7dIvC9TkUU7s@D1}z2g&q<;>KBK0uL)w0(vsSVI&F#yWNs*A*6#7I@!EH+ zLjG)RjlPE0BEedP?bybjU1en2HuC-L&qwandVqmQlH_19sonp!q#r;jWBF|bo!m@b zsZCBG1$Ns`@?_kWq?-noe(aWF3?<}>;84Z~VaSIDX6}%P-o1^a=eEbbO{M7S>6i5B zm;h>^rY={m?iID}o4{_vbptfN1MSwXpEydNG$C42T<#`e@B**z@-FadFe|dr6lUri zEpK`~!l%|ss8WlBtU;-&K^OvN$ReL&U?@JrG2-4_?a2hKn#6!jDIMD3u4dRO{i^#O zVlLql{>qE9)^D;7jBWBSFh%0E4ln^{tF}T6wE!?}0w)5`Sjn`E*+H-apY%0-%ml}s z1z)hy$ZOyE9S1W5I()FznjUanG62|lsLQ%-O!B;yOHsh!|^ut z@#b*D?l2EatQPKN5U9&=!;pSK3W*}gRX#pjvX&uG~cE%j@V^+&EHedrYzb-eZw=@595j0OTHNV57$Ty^*>9Q(u&JVv{E$xTI<7Pv_@le02i2!!vT-S=DBJN zxP~+XUlU3fIZ00wlCSGZyDK=k^pK&VIc>0}*fcDLFi&4OmY=Xs|H794v_AFIP_NCw z22`gY?3Ot-ny2|wLp4PBB1KF!dJUshOK%vaL{^I9$8YeTje7QHgVp_v_WZ5FY418}i$^5Oy4%97Pv!?D!?prt@&PJV zl-@SADPV+v@`LPl1a6RT>m+dJTXxe2P{xRhbo&o=?rFjDau=m@)ADfZM^pAWFJrrQ zb2nAmAaP-3cpvk4C$loAH+!>pd*_KX!#6df(OcSg?&`OG^Y^8YGeIFQU8YK_z{;xt zowc}gg|q=Y3-LVP1z!lZV&WI5A7)|aH^}21G$kWy>6T{3TJsw_iHbNJ(r8UzlOcplf6%?a4)p*;)S_(&J7Kdit$Fn+|#|9 z-!KkSL`1mxRA)qjy^0V2Fkf1{o$t<_!_MPSdY+F(Tgz0FIAf~z`JZpjHo8=Rp43sL zY%_xVg9cyhKu%3T`WMrM7?*`mMQHF``o_Cs^Km+CeR`*Lys;=Z3>|@DEB0yFe(oQ^ zKR#__r@E^1ajOr%)}j?5)A~f7nnjLZW$QYx^E$Apc58USdYpzO=ZBO?3EdjtZ0{|z zpWGX;m-s__C}Z2Sld|D@P$K^+#+-f@Xst52{gvaQTP%M@xyOgF%bRph4lYY0=K{o& zCs70rjB>EcmoIhd*s-HW&z?Q7DDJXItX8dC8%=dg^$}#qRM<$CG|Bfl?50;wL~7 z192?Sab(GpDOa|98S`bu0u2+cB4teI(0j?8In(CP+(nI8KZ5l7b*4<8XxFxV8~3MB zyJ_#{o!j;%;lqg+-vs|0d2-{Lm}|m>sX6oKjvUdkPW^gy>vZOH_x@c@c=2$=%ONjk zP8{{-;k0j`27W*J^Xb>0&kuio{rma%&)<(f`vjzqp8*X#5Wxfg1F*pS@^SFNd?cKZ z!U`?4@SY4c%#fZAJ^T>F5b0@$L=vxBN2?T7RL3i>n0XP#7-fV}m>O-o5l0+<`K87k zef*`DAcY)~$RdqA5=kC&v~idwoqQ6?D4mps%3-La(yT1C)N-6Iz5H?N{SOi#=_ z6U{Wyq=d~j-F)-4N91HAuGH$nOAXTY>Prj0`1})4zpBt;P(lp_j8MQ7U6j#A1N-bR zDIz6I(!f0XjMD#1p~zHIPAT2guuw%EmDEx}HT6_fH!Z9)PdWW;ibnbTE6`d2MFZDd z(a=KIUVZJA*S>HKw$??bi1k=xkNqpzW{(|p3RMq#B2>;c+w8H$AX|*F$Gq(}vv9>7 z_c9|QGlGS5)kRm`b&p`dg(Kvhm);hTxOa(s^JRhwC;a`_i6)wGh2Vk>J{aMI6n8PZx+zqyWPMAAG}?5`954; zBNE@6=ep^36fi0j)%36^racJnC=yzzp@$@zsG^H9;>aVBOdkoQ)KhYa^_FmY9d_7v z>PD#AZ9fY4qn29gsov|M3ixOxe^PkEu%>*t+kwQ>yfzRvg^(=>e7p}StqT6 z)N8TLHtq1mSKG49Tm@~6z0xnuG}NS*6B5^AldZPjbW1Kd-$GGNxKE7hA2$HRAODCG zo#z~II@Hk)cee8#?=TQN;c<@yC&->S%z-`bfdhQfu!S_NAwl->&j?A_pZhc@geg?v z3I+dE!Uyr=LNSzKg*LPy5#8`ZCDLI#PP8H)8gE8HjM0*aXd@o|NEkpu(h`~2L?`y5 zh*FZ`6qQ#+D}repWC_!lI^hX&s0oZ|dea!m7^k*0qE6MzQ}+0jJwMs%PlZa9qUH!W zJ2t9Pl#0}%^q5D_oX=IK;#8}oWh!b(>yTj!6=6nI7)NFbQ+mV{AEFT9&g&S;}NVAzG+Rr6CXLJy*I?ZQ2^&EXQXqb2%n(f9o6H=+(=4-3yo- z8=1@kRxySh6Pd{@n8YBKGG=d})3QNs}qqZqZQ;ug0zda=!MRgl~rM>@!Xv=T8oD=6n20uhN&1Qr(A z1u-z9k&c++bf#0?PD|1{pK2p^K@}=DW@kI2{v>xv#a&Y3(Uhh-HF&`r9#*nqymTNh zEL&opTGk?`M=(MVVby0FPD56_kU=PLvB`L}sa$2th7cJ>3K5cP}G3N737{XA6 zFszRZW)N)q=E54d$S*dW;KXfw)0_Pb5VFAepKOj3oZ|qnvXQl{a13}r=V1RrfpiEh zcO2Lq(nfGR8dPn2GN@V(cJQ?}YeXeJv5C6C?skV{BPcFu7{ZvM6oU~AE1nmnS^);ZDK@1k4YNu_zS4Vng$!o!T2~tj0W-IZ z%(?*QH+1C6WgZ#H%am9vR?)I&QmkYd(^$wrc1}EJq_6je1 znaeOkn9Ry~PGE8&3P)gDJJ|^apA9XZ@}#F7l$M7&Fb$vn)bpMLI#7a!Eun#)rDD|S zwunAdqK2NE&M5kXjrKUBkiP4i(om*~w9ls#ISiMIJ_pYE-9+72|yct7FO1Rx7cVL?mJ@ zgJ?@w1z{)ZnFcTY-4mnSYGD|gYsNMfciLVFVb6$WFJ{0tw(GJQ*0g4Riv^DUG+Xc6 z42QCr$ZTzh1DwS^HaGu^&Sw#b9R)71vur(r%cgj|z%NVz7Ws*1S6q83Sax-|-Kb#J7^8gX|>+6|I+b)oZ}^W5h? z$2pRG;S2CaDHu>H@6yYgUZ1OyFfzL0Kzy7AiF? zs)EE7#xV}}xW$d*a`A04Ja!jHf&5D$<4a`xl9@4+TzX|TGt3f$vc;6p`fFZO^jSU` z%DDVxFmqX94PS3}>6kbDnc{2%Z1!Y|lJnt=fG4CmyIj(62Ev z&}OSEp$oleMB5E+d1ISm4(Di#N*et<-lgI^3S?3@E^dF}G~_%zNW+Z!AW}F87ZP%6 zRKGNIW@>a??WSVwBe3BBXH9i#&DK~a*B)?oXy+Xykk^3X*M2Q2h+^2NqS%P1E7HL$ zkVhJn?JStbd7v%720_}W&D!jO4bnMgU3BY^O26DUjG0&d@IBMF<3vozrfrK8{u?%+-<;kskt!tmk7kb@@9 z49~FQa;rcv&bBTNKRgZ&cWVtbPCrD>4k@ID?&1IBL?q=@uDPJgD_~AW!fWPeZs?Gt z=ZK`|bS@DW(GeZ-5Sz&8dSU5?p}d+T=`fM$Hu34sYwA96tE{fRuukjTLcgX5+qA7O z-l&bj4vxwW7MaCTwkMBdPzEVy1}Q9%8c)OEiWe)a!aOAwX~j?iFO!5tlYRy4Qq1hk zPVt&0R9p;IQ0nn$P%&hzF$#jla4=kiAPR)Q@*E=^fuN#xOmH}g^MdU2f+_T}Nt?9n z$es+Do@vR#Y-J#3^)7~*UTJGZ5peQW+&?X2LN+8}(oxtz= zAZlj}Vly7?aMCaRDs5iU@uPO;p~$YJKBX}7hM{!EXH2ajQVn!?L3A*J087UJQAYt$ zA{(-j0UJ;z9uNW}umXkR0&^!Gj-o6#Fe*9_D?soA(c!9)CmKkQEVjydux=0np)LH0 zdg_7=*g#MCVv-_hTB-$>xY01h#e0PDuhK`bfbcY|CTifK5sdIPq7XM8s|xL{fBvVk zii5HM2oylU3X#KpHfuNruCut13$5dUzAy|KZVX*Z;?9sZC$8h#5I5g24tLYy_CrE| z>kdOM5BCs6`jCfKZbe$88qlE{1d;z4gn=0fu}Ns|x^V6gg5)}dL>CBw5g!rgyi@3Q zE)t2v7lfodePI)s&Jxp;>7v2B-19v<5fnl3>YS%O-NZie6Tk55E#SgxOapsZ@lOIw zK*Mer4-}7P(NX@0?HFmoC`axn>=zelLMhbT&L`~(4Dc`slZHj`O3cLkPVo?r#Z;*m z@6YZcuP|$jd=66_fdCxE5gcbUMs?CLdJJ(oPhQsX^RUSsi>dVJ@nIN7NKwxoRVHHc zu?aASAN8g6T2J;8CSnG%APv&?5OU1^Wg+v0M?cSJe(%jFvLfY7X_k-9HnJn}$q)35 z+DdXRrca<$QbG@^C1Dc(9IF2&!!P_W$9s&x{2q-bc@jt44=86c{>tucJOxEhDkhb3 zb2=y0U~1KNp%!S0bYQJ256~*FvLv>WD}l-@aZM+PiYLO-0>{!Ufd?MYvIAKJ1k-^n zK@h97$^`2&zZfBF$m&jBaEQ4 z4C8P=0E7-}OXGOcUs;Ghg3}I%lQ@f0xq7I%jHfxBGdic!5WVXV4?$ulR$_bM5D4L7 zF_sWEmSa1XI~UPnv-AJwv~xU*r09Z#JyTX?m(J|_ygD#aFw)>0tp!R8dg?oRFqiD^%i7aKH^6y@+_#Tbc2#6UD_J&8|t zrC6wzln~DupAl*wPetX5MUPc7o`6Q%HqC&{qX3l!jsPfqsY{2RJ~Std!NiS_oeNue~$;8DqpbY%zCDF#NxUc&pDo^c(PhUxH165G#)|WC34BloKso<@s zB_H6t?O)iAXxNn%qu)l+RPR6`XkO_eC#0ac44Dl~8^Ruy>E z5=E?vE8Y?=m#ul~(i9mX5Td56`tk+YNd7Jb!_Ic{)OOsoacvbt?*KzI7*pNIDmCH) zjaI{}s8zA3us5i%G$o6IIdeE@qu=;#vBH&Hi9_GY)qv7*PPZPCyHkXE#)PhB0V`mh2!Y z!5FkbAGH7NO661Nu0nlLTIzUeFXfKd7>+_r#QubkKdJB-#gxSM8K0%`62lt#w=w+J zTi6yHzmZ0DMn`*T{dh@7GnXCP5zF>AnF808pJ{NviJ1zfWS-RZ`Y~UgbaACra9aj) z2~u)z@0%)DAurdQK>1$a3<->{AwM^C%XD<@pmYI2P5mi#OHwXUBM<_C`urdz#b6~_ zB?!bOcGEU92(3{I?RMp6(Nq-k%8_?_a+7mL%@*y@;D)bAN_Z2M!jO{td}ete)p=n` zrfRCyUM*7-kW)Jq8?y3Kw>Q@!aMvmj9>6zzgNJ-M5PhKwR@YZnu_}w8u2!GN6t(6* z?brW}=I_%YS*|GAMG+%1HpATfs#!?`2!$|#qh}H1WTvMzG%eGyG83|<5Q96DGXqY8 zIU!s{livtPI6n9^2TnLZON6_Sgi)(JP}n^pPK8<6Ug6L`*f6Ww_JJ2qoAwu$T7t}%8ydoE+E*ouv0>56WPIk7#VZh5>o z>cSYYvCd}4c(F|pXV)!2*QyoQSnPau>|pVYW3d(|rNjKFj&;#N!{+TqyN?yg?k3ca zUxn-h%xi^(Yg?OGb_KRw8&FV;L{ZFHNVJimQB|zPwZ`E;K-tfJXJrFoiJS0!JUo9Q(B!pBdMS0;s0XY|x@+?mn7ZKKk; zCq23Igwkt=eSZ7Rt4+Fyd ziVO^Ru=Xi|4{MAo6BI&0TrX3n2Z*OJxLZ9_-r=;T46`;613is;!zf@s+FhHHHIZLB5*N5gkIrT80R=hm8}hx56u`0n?>x z7#g;%sq2Z77>VT?W9Ry=OWo9$_&P-uCsDLYUG1woU2l04gJ8SK+I>_VG1?kd#rDpbPQ4pR=VYGp-^j8V2V z$&hI~j&S?za$C0(@7zhL?#vdrw?(+chXvAxxZ5VVkAMs2#b=HH33hayog0*4Pr9`! zAg!C=o6H^wGMrS8V7S|rr)&utK1vVfy2qQmBiBk1UX>G4y)XA}Z)X1;Z3ezWUis#m zzL^;i<~JlsGQXo0Yx)}{U6)eGhMViuo6E<*#d(|~YW#Atzz>HU*#*KSt+^*0{^AA< zFdW0_kDeXWp4W!dx_}G3!2cpO0BLFfO<^hndZ0~0#k1F^T0C}M9L9T1#>sLjS~abW z2dm7%9Fj+)H+m9Gaen6)pnx68mz>+Eyrf+;-l5#)Az6@CB@EKdF&{HB$Jhv|bvMGi zey|mPrci(+3(YahTi4vp-2wCAoT$Nd^YJasF*p+vXgeI?J5=+j9VoR5ND zGPHHkX*Wz&FbuUDX|xB)QvhO0m4O5c7Sy7p3c`g98#>g2CL+X!XdW&kh>)PbDIBYG z^vE$JNRCiKPJx0lrAjDISh{5SB&N)nG;2Nqf>S2WoI88^+{xmnP$5K#9uX2HX;Lmx zxH#p41gg}jNUBynf;FpFtya5wt-2(v*sx5>Iyvj4iCR}|+qzl>H?G{dbnDuc+bXZ# zy?R;s^~*Q#+_q{9D>;043F5^{3OjD%w(VWMe=Gleg*pE-tH69Cw?*ruER(TbzM3wL z#Ea_HtX0=}4cm_F*|hEC$pa`ipg@2A2>J~?_@d#981)W>9FLzncg%?C(nX3CC_$=Q zzkZ#k(4RJydjB4Uium#5se~7=^hx@dMxGdX|K2@(oJLsKzmGq^{{8st8`%nAQ%@~b zUKj=*ScQQFQ8CbX(m~;!dQqqslTuuK;l*pR>7mCSd%yzXE+P_BONqDKVoHjstjJ=E zE~bJ_j55whqm0?yc%wEt?#LsL-24b+kU|bgWRTq)iR6**EXib(Ou_?Ylu}MfWjyf2 zgXKC}Zpr03>U{YnI%1AVW;te_d1f?fu31T&ZchIK=Ol?RLMLy%^>zjuda^+V84404 zU7*w1bklZ*ZWq*{KqabZqmKF%6A*+#At*s(j6sGOXKczw8+R_!$Rl(WT>_p`7z;CfPayE**1>OYXRiG%^Rc=$6YaxpKTK2ORRwOK-ht+>39%TkOkk zzyAKqZ$APLOmM*lA1p9G2`8*DKMnVzFvAifOmW2)UyL!r4sYymKKbzTvBx5hOmfL4 z=W|cW_t3*~%Pzm%ayv55O!JmtszYYZ)$ISwOwT?K19Z?r4t+JU#Uxgj{X4)mLxLb=QRK;dR(zk1cl8N}D}uBlcHfP6 z-gmpncOr?z2{@dIL_+5zqSA?Y;)*juT;s#_*2bo1^htT27F~{cLYgbYxj~+P4tnSU z86@36QiKj@6@soVs7k9-I^9YuJ-AX!D8(*&?y}PkJL|qzTF~g8Cv;He##giu@(+Rj zkw&AN1by@;>7J5IC=rT1O+6J_=%d~PQB;5e9`V#v)ug61 zt$~e(YD1gbh)_4X=}mA>2%N_uXN7oRj&q(9D3o9aJ3y$8_ij=X@F>MR<>6ru%>$n7 z!RI|dFhWoGgGBuR0g3Nf-&U4VJ}^)L3{*Uj6%!PODlkZk<&i>CCk$h0I}XLRgUK1Us(z zENE2=6x#}gwUoK5Y#qy6-x625*wu)1p0iwXm_xkYRj+u;D_{EZ7ecn61%T&K9+lVr`{WBb!TK3e%W&?GQ_&DNRp`Q>OW%7jN^0+=8LEpb9l_ek-cq1ZUL0 z&53Y}Yie;E*Bj#e0S}U!9OblNIfRhGcwA+OLWqaDu!_|qo-5s0RrgA?p6+*Sb)_qD zS3Q(OfqHR;30+<1yWan?RV2b29#}JSJcLL@dC4p6MS?d4u#$BoBavS8?s~nJ*e-k6 zlazKM)xA}2$0%Dl-}$Kc6e@}qgQP7jSl%a=_?=~b2*lr9TH)FRMldgc;U8z{@;?9) zkbnk+Ol#@F83tMgGk=-wDkfM#3yLK*804UHGvq-K)<%T5(TyK0i9+E#?hh|n+-hG-XSti_4isG>N!2pce>BOUFSjXdVDk0jpX9|0-ICK-~D z>VQX!zl2Cc-faJ)jdWz1AgLxvPBKoBI9wnYVW&T^A(NZzQx*Xwg(oDLP@1hTD)D;& zfIxr0A14ciQB779_gcBSfylB?v^1fY7okg3rOKDT9Hy*%Rm@w(>X^tZmayKOiDDwF z&2UzhJJ^xUZAQyg-vs9-G@*%XVFFy?I_JCGS*~=hYn|?lmptW3&wKR?Ay{ZgrT4kd zgla5e4CA!K2I^@|i+a@kTqwvMit3R?RH77hSv%-)QH*j)qm1k*&w3WpT$9voCgrKx zQVMLXX^o{EB7`1{&7oo=JK4-W_OX{8Hn7R`rNKtq*>alGxAg*Ui0C#V@aFAs4>b{r zNUFJ$+SGIhIjU0sy(A_#Rffu0Zr)w3_hAR3*t6>UtY$^B>eTv5w*KyRc)i`A#0a67 z2w?3^k;@IFBOB4k#yRd-=|T2-FrjSrc*4D%gtE#)077Sv zP!;q|<+-idplVEu^V6c1EM`edS`HYQ*uq6GLI>__Tfx8x;?@W zy%PfEOxh!#pWJuwP}YxrvtpVkigxi+958{k$i*mlQ9|pHkb1bl;4f$>*%D5ph}L*v zH@*>$9Nw`1hdm5p5$~wPtRK>ePn_ZvQ%R9viZShJj1C*43CB6sao{2`rxo@F4`$F4 z4wkZ{Wi8R(xGRb?*buY^g=G^e@E zZ;D$ItMw(;fZZ}^P9mUR-nICXzSEY;}QpP04j>+2<-wdk2Wv&0tb;M zY5al(l}2e5cu$z7PozdL1O+kw)PbG0fd!?3BS?Y^^)VfjYAF~|tp+o(HZzF?Cbh;< zx5f;)7E;163?}6^zScC=CN)%}HHAP3LRbhzSP0J6Y)PnuOQ?j?22)gnHBJL;N;5S* zxHdQcRZ~wBZd=HOK}Bxoc5cW4WIr|tD^yAA=5A^DZkr-+ZMan!XFS8RZ*xe8|F(Ud zlzalGhj0};$`=#TK@%hQ5+t`fwDTZ(2t6C;ai{}_aQJZ`_i>FCa?mq!3MW}6M_Job zWj$dOhsQo&0To^+iW-!2?z3}bu>?#YKdcpWc##)%!533kba8QXNM~EOP!EuIb7YJ=92H+)LDj|1s zXJzSScX!ub?)4oeM?_Obct})VhQ}3&7h3jMtkbuB{sv6F^GG*w|l&& zW0inZMTIz)G*z0UNq+JttK)YwAxclSC{Y%DQzm_;Bz>uLlbfiC+mU@~rDc@keI}$! zq!KEVU@D&A3F8NU#srm7$t!FYP3~uvs=`d1Fipc^mCVGHUpXti8 z5(n_YmUHk1jQ|Od@CfR}E(^$j4+w#2&@WklPgX#I4uMbkWKS13Y57EgB3Lj3)oC91 zfrsgsqGoC+n1TdHfhR+E( zRpo|PRd4v#Rrpqi*(p|cxSeUWhn@silu|t{F(C&RSA$ZCZq+;D2|IcvD2WIXXVr)g zL0ApZJR1RWlQ@ag!*JtyiI}K8SLTyKus-QCiU-O;rDzqWm|Cf*ia%EvQHK{(SBtag ziu+@Wm7#RGXc)W57`@nvzo z^>~k3Bpp;BDCg)MQs5L0wjlxeArn>$1{r#86h{l$kPZ2e5XmFkpbZk)dKBpl@35yS z_6`}jksIkHoJnIMX(qhady;gL%!!6XP{#|in@lusFzvkH~G!hY@7mB?b1oA6Aznk-JqD!w{R zgJzazX=rQ-FXNI4-oy!XIWEWwX%2{&dKrQHk_8U&mzeV}f*F_$@tBDjP~R%9C1`4s znQE1JnK6@@nh9ewwox91Yoi%7yp}ep2{lHDuN>l9Eb&oY0wuZQvY$p>&~RfsXv zhuTMQl&55U2eXl7SCBOwE6bj5^*bi9SR%2A7Du1SQ=j$5v(KZSMLRu$7+C;n6Q1f5 z1iD{e;am*bqNE`fq)1v)n~FRKp%LnfLsyHiWuX^3qPG}}9NM8CiWng37DhL=Br1%8 zaiWotqGz$9SZj=}@jeeW8?k8{HyQ|o0JwlF2&B?f*a!%B0HkIRUg8B;MH&RvmtIQh z9Zb5U=Wv*N88}Lcv@n5YLR`qr+qp|Qxd4jyGS@wsJbT&(txOJqGRYLe15=^ zW`L?j76v7YV3=Ddn@dVN$&NaSsXS?ug13ovr@olzRs|7DmqIy1b|-=WDx@Npxx`Dp zlz+1N3DiQXwn8hnI!;^pX3o^BUCFCh31?f$tG-H33%m)%nwI5KfN}7w$a-kW0twFA zXm-hf_2e%Tm^t0b5c{+c+4`8F7Oowrm?}K3FRV}uWv-NY4=7`q>AJ2qGpLL7uJJ0b zIY_U+mYVolg#Ma@AY{Zz%xuPXHDDuc0b4c$OR!V_3~XHZuvh%B5{r${i3fKQITnkt z8CyA6bvYjUvG*3TX{^Qp$2#lDI|bKp`?y|mJQKQOJ4nl(Ijggg7(Ah)1&P&Ffb0+) zG01xya+2s+C_xen*KkT(S=i^PLg0xocN(m5iY#ikQi~d*!05JbTec`Vx1muMnXJoWvA6tMgu1buftyR}_M^b;GUN>P?X;u{p%jFU_&ssM_83MZ5a0>7J7d}rV(JDN+Aa4KTv zl+hxqoZ!E+s%CyB!1IT|2JB1B1T4bROUmSaxuUD&lr3*2Xyt^K3W&i?ovdpq2NsOM zkG2MDKu-W8!k0tBfjMdXqSafF!imXgV-3S)U1}yc!!*olI2>y*NT{8;Ge119yp}Ym zS#3nTud)e{deF;Zw;_AI*Gl}aT(bwy2E|_UgH$}lh0tw#soJgpk&T65tDRv#{@?`xU*M7+dPZ) zIhjMqyxrRiAw7?1v_&i1*5k-E5y_nOj!?TAsFlkr3f;SWLDKEqX3<-|#TNNfp`~of zl!3~rTo;eg${z~KlF{9LG0Rp5w{c4tx2#;$jkQd0rpdN!&1QtT@wb5sxP(j0EToN> z!niB(jiGud+~ar8jCYi4xt3QG)=Xa<&C%IBzKjANp^F6G?9B!uT8=l)`Ix%kaUtm( zy8=mJ?i_jw$&mBxkh>dV+Tgn{{^I#uB>UVA{%n!zaN`55|Ez=?` z>KDK{?Pd=Ae!gVDzp5$(?5mhimY8rW02qMmQh@N}!A|XH^7QBNbk$pMt=x)FSzT}Y z@(@?h5L-|NkN&M2V=*pl)|I}2<(k$FwSwsiYi+%mJWOMv`NMQwQg#h&c%9eJ_}6~T z>aD)Fy)4*GNZ*I;Qc$Sar;h5Vj+~B-oRuwnYKRBHj@g+lIh)PdpRI8Xp~lM|R{d61 zd&t^t40j~`NtkQxmiTZtJ8}|-+xzy%7V%Y>BgnuV+=x8fAyE>Gyl}^ziJR!OPwN$y zT;0%3@AS@d(GA}_x1!hojoq+pKVUnd+|9O}p$fPd-nuy6YAd3roZjCJ-t67pDw@mr z&Y&xrgk6(tM7$gNEzF~`I4cAQd62l^^>%M8cQpjb=(WC-_sl>f&6In&Ojgb6*wOX{ z;hYMkP4tNuj^P;2rClVccPAa0S4IJeMzQdDCVt{?s^auq&)ERuFfQXpvd_*?<2LRL z)}Tn%p!GZc){KTq2R!!Z1#xoag=*C^$Kxt`aq?)=X$T^ussvA)C|LhEB=>$iRgg|Pk1pXXu+5fBSeWBJzBh|@!`UV5=S;fnQ|eNl`IRsgz_Y2%qKN% z-o%;n2@swhG^mjyMU5gsn$!ytFJ6{Bg}Q{vRH{|2Ud38fYE-UWy-H=GL`f5} zWy`uk>uS~iTDELkxosO)?p(TbTiwN*S5>RMbyt}c8(8q*!Dh*(Rogc2VpfeEKZg8x zG2XU_(Ux_R*$LIJojrr4sz(nY(xpw4E|j_uph2x$KY|_m5hL1x0x_};NcSDyV#ajo zg79S!;>C^s6dJTovA+bafwb3S6HY+k)DulL{e)9dKOvP9Qcp$o)J;}hRaI7BeKiwVGdXouTW9?wluthO#8Xml zwRIC&H^HP>V=Ye=9z=RIcJ=E z;klPXeg-;d)rL+@G(8eTFlnWiX1ZyopN1OgqZ2f`YOAlVnzRMC-h+^?PXjw_uzxn~ z5JG@H8)%}}W?MBwbb~u?xV`k_4?OPn@@_K#W)$GP!Q_`;EfmeSaKjJZ2qG;eV!Uz3 zACCxf$tRcMp@S?xvvU6oMYD4>2|`GwLJ1voCYVkKy&&NfQi&vvB>xCph(hj_!|&T`fSAP!zfI{cvmfVLB-IDN-XCsfa#fO01iMu7`p z-~tlnBL*?hM?U(w4;b`=o&Rt!Is^K`7Y>9V1u>{W5Q@-*EVM)nX-Gs*gyM)yWTF;T zaYZ!R2931HjT?2b8$0@9k9b5RGLrFSXGDjS)F`DXS?NkxnnaeiWVbH?&OVm&k9L|v zIuf4Hk9JDoc+NA(;uX?QKMCGVKv%i^1g>w9n$)BoA&A&~%95J`MX50VDXL7GDpj8( z6|6)l%3G}}6uJVItt=UebDRSdp8}S!GI6YBIbvDK!lkpO^(||OOIz9sSGA@^EpLs> zT<1b2GSkH_EMNg%_PW9|?PUdM(hG4~a96!Fq9`!20aB6@#Kgq;u!dDkU=15*I@P&O zf?W(_9)o8*GZr$DnarN_P+2}v#Q< zmnKn&4l!yM#VFOVwo#6X#(xVE+t*41QUI3pXKh0%(d4$$xzUYoc;gKlWXdQufXSw2 zU_;=@Ft}^>w5JbQ+~kBhRH7DjBA&~f=OD>pO z`bu$%Q?z1!xsk;!YSD{f6k~wZ@gpJ;*o<~GY9Q%OyVQj}t6p3&KlJ?Giae>RxK_-rwG7P@00yXQUi zna_R#3Bl+9sLTdRGlK@BXFfydNr`4O1Ub~9O{*w^DmrRXm)g`BMYTpdy6UTyMnR-8 z+G=IZT0*4M)-08qOLgssJKWT!HT89v1h-S47JID!Ks~lmmHjxcD!X!zdp1Nar&I`T z)!M4V33;7UUa8uocfRx8RfS`yDX?y>w|gB$K%%(9k;JR6JNLPF*Amph)!xD@o_p-7 zJft+mDNxz#W>TBlzFx(&pqWZ$1UuNo9M<8h5XJUXA&SJVMX{p5IL7}{KCwtvvXl*s zU@wbVy(qS`n^o*x=7N~?k(LPupB`!l?gUx4cEW>z?QCkZrP?+SIJq4TZ;ylT;kikJ zQw?r)m}8x#XNS1Y(TSj*z+9n(c*KDGPIZsq!tK(~>+#X981jRkFc^2k+;$-s3S?2y z81X?6axZ)<)WrGL*Y4Q3?|t*TcmDPlM$PE|2H*n^-~bEQ8U!}*kkFxyN2`&+(pb`i zAzY;_8Nv{Wzzvu10PHc0K|e{YDo&I;bq{yg>ZcE+3iU)t69ekRr5jy}4|S$6xOi_c ze$<^S^@vMBLQ}n}F(^YdD&hAylt4y4tcq+ZPz{;Lvid|RXN8F;(=wO11oN}Byyb9p zSzF&C=C#IbOmvyq%+>bjTk(QLRcvO)mW$+OsPCb4Y_Hk1==+)xdR~NjbI}}VbdvN zLqf3%s%2xsCS0~@qc*MjoTf4eD2M_plqxKos;RQVErh*r%c?LG2;BK9cx$%Eah%1W z9gr}?)=?{lc*C{YoqD@B;4!2(ag*b@E2a21y~2u_1H^$Vxct!{t8jvavmU~FxQC0l zwP?h)$heHNIEstJNZhz4FdvW8M9LDmk@FtDP^?gF49*J0#acO*8?DWFIq6x&m}7!K z%nV(SMOhr1LYS~D$+?|Npg?G-A;c{e+byB9AnuT>-wG78OS%sVp=DG?AIb^lBB84D zqv(PzY6J?ZV-KXmF8T1fZmc2y8q%R~#3AeGq0qaD=QytqBqH^4kXV2aVvrEIGlg65 zkh;6OD9Sr3QW3s$5i63BW&p^51V|kzyn@`3#7jKJYdj}eu!f8VX^^}KQ-oWjunO}M zz#)VDIFmDx2`PBS(kngkkP|sMJwQ@D@n}5^>XV&dN#KDAG{K{Xun#e*sYi;GMOcLV zlZ{KMF;2>)Q!zf_6UyTwrQ{niK@h z&=k!ZteT?1L56Cm9jvW}V$D4GLEad`BJ?$#BDN&-h$@Jke8J5nd>r0noHKO7;B1`B zk+x`yLZ(89t)hu@%(mz7NEGw7w*o`iOP#KYLx-3gHRK35+)lJQiFj*>f#4mN__jKX zt3uidA<)C3;J4-JLq9Y`Sd`ECbRJf$ibF)i!)Ulg^oxZP1+sv+xTwSd9nd5&&?F!X zO;k{j>%{%^o>GL+2&IeqX}Qw+imOlptXKji*w9y;PbWYkS}dDGpvXj+gcF60NjM+0~-2`&mjo^VH`%~0Ip>0pyGNu>2OBT>#(3OkCIG}K)S}}%0uNs$L#XPB@F}a z8prXfDs$9EEfioT{i7EK@)r^E!PjLK)(%5l+_XK94* z>!t16%C7Xv@>`}X$O1Hz7qWD-YHG`mu%`HP%Q65MN14k4x>Qcs%Y*5^Xrd zp6iK=2sK;9nov|s9}9g74((7w3=7Q=i_HiOr9~nLnMGY7jh|73OSpsyJJGYZ9o@F6vk4DN4nbAD6*8V^)ZD0|0wrBi zCT-Hx%^Wu2pmg+t^t#d`iUnKHQuykSROr&X`_d8#Q-0)zG6mjdaE5?P(;ivV!+Sso zguI4SFo>MfXi$Xcja~`6JUqn%Nx_5JG!r}u9S#G@@(5JV1u;YV+&{@6xWcNJgh~Af z958W|7^9R*eS}QO6ifvbpXAh3@zfiOl~4`UQI(}qZL(WoRbz34R;{J$(>uQRbqcDkbDiIIuL_8 z5TYUmL4W;Mfz{&C)WL)G;$CdnFz&U7#mI=QP1{7a+r*cSW#cv$Dv=dgD>NN}XpZIN zw(^qP=#!+4X~k?77r&e__zPMsZ3dh1!Y`q@D#q&OMcBWO>fMY#J^+Di^Z ztFTY}gxbTh$-h>w3;`Nc^wFU?@l4^+4<(1P1vs3A2zMn)DP+`6v z+uu`V%2G-`O)}M`92Q%#zFUIIX^Bd2f#7YC)nB^mYyp=Bj@1gb;4Sb~Uj%4B^g(1Khrr~<(R>Ew+aDAEo9VS;F)|qq# z;zL-QJQ!jQG&LHMVtA$@f3xh%#_Y^~;>-3xE0(BKn;Ox`;w;``f$g*}KG=#9a>y@4;x>kSlLQtRJ*EX1tZfaB%SGZDzlH=0u2u z%9~~|rXg!ih{kPPp+i&~9hAx4(WV>cr}M((nmQ9oy%38oKVfJ8AEJV71Ov*Zq5Ig6 zc@D0ra@`?nJ0s%fU4X}Ul)JeLXn`JR{5t4uNCt#fXftJK<2~Lp0;q|O(?taR;*7Oy6= zWHP_8UKcfk7x)|2v|MY$3E>g`1DsrhN}@4K;v~J6RzaKAbE0*<6g0oyRvW%y98TVU z8rQ>iOmj_FbrqVm(GACT>=0}U8eigQ&uq)y?92Xw%C2nx%%0bK^=zf-SByGAslgf) z1Wj_E8mDpWAx`(lPMU^N?bQx8F|a9lH)DxyoWhw1-|S6&&-dH*cifJ`YFiyBt+qYd z<2x3e?bzdjNciJks^@O*I8-ay9S9lcz!CoU8BULytFbS}x&%R0%e zj_J^kc$VjRhEmqGE_}}C9>-FD{%6}QauGT5-E9&7V<3EE*apK_au#WF;C*sui1KQP zXvmK=DqpZG$8yV`dW}wmY3}kbpQ$h(&gWEF-@+4WO!JkdE113@d&{b5dkD{)b2_)F zM#1SjlV9HB$=|aiPkAMx4$9*DX-!G$;a9#y4|F2KF;7|*S%Gw0a@ALrU`*eZE*qxo z<8<;Xmoh7}P#8L|$^ zk|f2TOsR4un3gELfbk-8=FFBfZ;J8qCvQ5qfV`w^pw`F zU&D?qdvhqJ2B} z?%uzH50CvibtX%cSa;H7J^S|USHX`jf4->t_V0^wzg`Ld{{D6N7odMh5Llpr1oEeY zf(tSTgM%=<0O5lS0w`dA`ne|`ej9TC*kOJc>StkqAd=XgD<`6uqKYT((xQvPz!;8< z;V4pLjfvoxVYBJj-(~PUH z!WwHc&d^$`t+rZY4LS|&T8*#2N)xQG!A4VTMbX%ptd4;&%j_S|{&5ByW=yLFTw&Z5 z*<{1L38oQonn`Axlk{r3BZ zAdLv}h{2CQf-olwGt7x6pn&2D!=Efnam5o`%*iJiFPw?T9z*i+$B>XbvdAZ+T(QLz zXR`6eoMf^|CYa2OiOr7SOoz@p(=mt7asUkn96-lWG#o`Eoix&N`0R7fa|A84)M-$? zh1F?Ty+syUXVEnlSXdFZ6|0eUh1q9c;g{NLtNm6PXO!{w8EyQrNF$9HOmf4VKnzMK zeM20I;QbI@xZ#H*p19(Q^HVrKjra5Tk&9=Z>PL_{G5{YMEm@Xr*b$e$Zv@di(9(1Tv!#RxfQiy|^&6X3H%Q5?uXXsnNc z$haR7DZz~(S`i)p>*%6gz$ivDqLGbsgrgn-;zwaY$rrj%Bo2~BNl9W-ljbz2M_y)2 zSJD!fC|RX85*NDK1TG_hGL)d)Oq8fpC_D8jm3p!ZV=5^HC`k!Qg*sGL^q{Ck z!6FtdA_k-?>t7PTOTR{_=%<$DTe>Kfv1PhzNx?M$- zr6WT$%URFD10MY4ueiJ=TSgjACf^jwPQo*u<2uv1)U+;kxzJq{lo#1ZGZ`u1WiDfI zi(AxU&NlR`4RjM2-VTN^z3pvbo|ve_H0H8~t?XqHW!T6{b~2BWEMzGAn9Mx3Fo;bI zW+Sbc&2Gm3Go3XJYI2a89F%5LqtO&-I*r=Y(jYXdVJ&N1<60KJCbpyY6K!W>n- z)VIkEV2haQ!632GzWvQ_g4=2+GUrvyK@M_`6KmwYYSy!Yl^>y7D_cQ_y0@BcbpmN! z>ktwBRE9v zf#ZcpRL2LqB0dmC(H--+M;UoDM}Q2;SWsff$RO!4id2$l^r@UuLb6MfT(Kmnq?srQ z=bmGdC!4$_%22+zN|MCZom81h1PZE4IVO~$vX>}a=2Dlu?4>U)CCn!qGs?tFCNi11 zOlM*_nzmvFm%HrcVdzyN+zdvtZsf;sLhD&=V8gWHGCx)#CWFGsWGKNz<2&D3#xj;} zaFE-WyTlKjWZ)OT=9cDX38G+CwdzJcLD7kV;$jhf*+m;R(vXVOWGmhD$4*+&j*XQ6 zW-Y~;BVO9Hol5O!H%(fqcZ%v%!vUy36{^*W>NTStHEfTu!WCAdRHrhPE@jXH8RVwW zV?S#V2BQQgn7y}+f#MTdw*Y^; z&R_q6F~9;IksO1TZ!c|WlY*xcb+!~5j#hpY+TpY$_oau#}0DW8?dK@0=VYUES0{Ihi zamFi|1_Z&2Xbe{cm4^Af916u8%{k&D?gnp2qH*Qim%PgiHOJ3MhtORI(ZyYgG=X-6 z;?Ze`5cx;bC6Rh<$bqy69Bt7E1Q^#<-PGNH1=!*(+M?HW-4_A>SQv@XfRRz!5eROo!^f{#=vN~6TyF3eu-+1~AS%I@)A?@^hR z1z(mqL-9Ezm$lpNBnu*F7&t{=AozjwUEf*I&uaCdAaV;Rxf7Xy(mR@D=ZzovvCty= z6F{NO`mG;2v6-|WoBSo3qU8;v?H|KTl%!4CPA;GTVj80f;7ak|rf~uSoV#K4vhx(R0md#P<0ImhTsTZfv%PRpk(~oO9mS{MOCs*m9k9& z{?TB>)ZpJx+g7Ea07qJnH));$p}(&sJeBG~n!FFp|* z8Ickk2r&Za)h);|@+XF*h||s8Gb-rar3f)d<1+03oj6!yAN`S!h(uY4K_MBQH!5C< znV2Ja3FK`_BuP@13<_sx#^tpWJKEDb9!Dr0LFi!#ZPMXKp6Hb5_|9?)3X2!_PJS&E(QgONF}BJjm)T#8cZ<_)Ibfa zt%1-SY6bd?(rD#YrkbqH+SY7=+JvAMj3uvyjR~G$S}IjjdFt8}Td}RFTjtFS=HFIL z+g*l2Ub3oSE{<5is^l~dV7h9pDvn_mA!4Tg4m~KQ>!d>yuA8txW@K_xMoi`uenb^s zCLESl7ETtyK`Ur-0g)97pBR0qd3Kp}=NIq>pR5=4(D2xDrLVj@IyeK^*Q0 zpVXuNj9hNY>%1Dq6yz4k=@xIr8E|6IZyjPK9%nx#r*bl9!8+F@l1+57(1#iUlzgTp zau;@RXLlAIdwj#Gd3tOEJM)3h=fk)-|dKx2wsP6e-rbQl7mij7A<9bitL-=%3*K@Qn z#@K4&gw?FdDy^1Pxq7_-;>S5}tVlJjS{Ay!L!|X_dm=&wB#@oCpE55~Hzd>tc zb)mJ&(zJGo0fQ#BX6s|gL>YGfE5o7Tx0SYUX z`Qab_(+U4(A@&)J?GsD(lWXvX!OHLn39Q2MS;G=p4S503MXbc~P!mvW+>wZRwTBaE zEXQ`N$LfdLx#AY>*T{Cj$fE2N<08qftQYkneAz4&5hHxsqSn1<&2I7AvB!$&tljl& z8si;`IH=I-(H>D~Ay_DooP;5Dk}97}8=wi2)`N$uG_7D_KL1J4AvK5$Ub1O>~qNqj*_XXv_? zmLd6A7pRhA@C66k)*WtKZ32c+yOvSoVF>e~E%zp5I7Vu`*l-c&N@`GY&db2sTqDl# zR`14h%8LyXmnmKUr*`2G5p^OD1#x$lrx63A5-+iTHn9^wF%(NN*HJOblI#eO0112@ z31BgRx$MhQ$jO2+F6!ri9%C}*YFH7z_iqa7X0V7iZ*!qc&)iP60@=QF1C0{Z?)qvbD_5J+hK!NYEgEp7-&x ziz3G+(G#4o_L#U3ak%gaCdR$cMf>>+TkH!$9okKb?!icNf8(E@WZvzx^EZS4vrLJzRk}eNl=FmNWus~(q<-b3e$APdC9k0kYm`l1q~+S!^L)oeR7n+8 zJyiB$6jr5b_kJ%|-5^6}8$!z}`r`Qc>Nt&`6=8NxL`(GN=qj(mZ(Y4k6SA8|Pq+S7 zW+4dPz4^Z)YiV0Kjw0|%JI@0z92#N|P=I+%pJte+VP?q$PNVs{7SFz|gdIDw zPV=-QYg}#tRK36%U>wi~gIoaRPoMvVo|7C?`yt9T(7syG0$ugLmR|<3q*rtGqr(OU zB_de2PyvrMbY!P?`fv}W^(U5Rfx30uF&Ne5wJt_6$=)@6dL4U~`hQJ`*om>*y%)-Y zaeKo5IuyB`d&pf9J@zw3wq#HCWb-VFXv1Y&SkZDehiRkX8MyOdJ{PJqnXG8F3dks8AU$B)6(0!!h9d zF+BIaGlSmtJ2eVJM8Jqe_<}EJgt5vok2rZC0YdZ@ZlQ4`8PL`VGs$Xi`F)Hk6W8tCGrLrucU`}f{J4C;1__5yf-3pjzd?%s%uo-UwA(Qc_p zWlZUmge%lJQ+UyvvxO6{7N7wdYylc3@&K?GlIv_@3s zlLt?;?i*u~bV*zJB40U{Yx%!%dE{?aPk4Ft6i=F8{_!La*z&X;!+GZ$QWZS%Vbn{W z=G=R`Fr-6z41@SoQ@Ut~^>u;)bd|qw7%l&(S6!)-?5VFhf2DdZvO4tdb$|W!Vb9_g*=H`gXZVA^t>1clF_^BO2(R}# z-TgYS2mAXgsAaoxHO`2QB&)J#s2$V3h&gQ#1T#Q9c_Ji=Kp;<|BviPN;X*3^52HY& z(y*aGi%)<6F_MvEMiw7Ih7>uH9R@{DK(`?St&3f7oT2$ z+OeaD=pI-{W9`~ii)pP}PjNlHg^g-et5&mR#g>(8SFc~Q8527eS6O3b$EGz_teCN6 zZ;!=2wv29FyLE--WtMkXUSYui2kUi+Fd{^S3>iXf2oRt^fc!-EgXa&PGiTVaF++wk z8Jab5Lb-TxBg&H=K>{hcnssZ}B0I*G-Enm7+E8%k*1a3|72m(FXc4Z3GjTSTk)LVv z=Z_#k&7D7zE`8D@N|ZQd*S?*5ckZA-dFq~tlP7YX#Ba~E9#VVv?A^EjU!MsQdHeI_ z&nKT$jyU9SLyiOEXv4uZAY7x2G9s+d!ZqMX1C9+hOe2jgKm-ws z;k3X4xD$QjZMU32s|iKlv`J8dE~nFwEN@}PJ}Gd$Rm+7GL$9H zY0^n2`-xJ@DXFZ|$}6ShN6RhwiBd~1yX@!7E4Reb%rns>6U=Iq9s^ z&UWz3GtYJSk2)~Tv<@*i?bK5+ zKn+z?pGYm$RG(H#b)h3vO0`v07b5kDQ)#W0R4=#yO4nU^?bX-+Ux5vl*DpjZmWwW6 zLiSi>nT06~&~jq&CY)@Fw%Qh@jdt1=x$V~5Z@~>$+;M9ft_m&4O;=rTS;R@(ccX%wMZ6w)WV~tfKZl~y>-I1Ni_h+BI zDcXrr{Yh7$hSFmXqhN_8DPowCO8Tj;x(cl8vFA#yvbe`3E$_V_i!HX~D*rCL{7T=i zV0`Jt{lN%>bW%zit6#Fn%*a3g&YtCVb17!ok87O=JZvqDWr# z;+M6!g+U8qkT^C<&SgUQ2SzYrhS&*Gl7zIRP{1)sa&(eA@R&zDriqVyDq&TuqR>iRnhGen64oz)39OEF3@ED{6&RFts%CW|TkwJx zyM&jmb@^|a)#Mhs&ebh!o@<-d^rpDlg)L{sYel&6qG~I z^|a?b2L=U%rBj{#L`d;Sg#=I`!DAo`*~pmxaI%x7EM^ULXhVC}GrHj{qBWbS&eB#i zqqU8r9UTGItd;=^WS|2SkXi>w8Un37t!Z96noGeJwz!!sqiKVI*k0gKx81aC8J(!z z@`g9W4V7<#3!LGQS~$NcZWqgF+~a}~xll&RQg^7s7c$38a^~i9T@6BP5JI|y2!SB4 zd?oQ1VzB|5<}?U|4FgBQ*4we_RSKa37arm)XZ`Lo)ryuv{>hMA1w|;zTOLx9(iEpm zk9yVHO7v%$W`F#HmbT=T zFSfoec5t<=0w0)Lu=X>ay0OBGNEDp^8mWN{Xbhoqjw_u(l<!aY9O!X#o9SLsWPbTOPB`AA7h(odHhR3;I%$xcQUl%<^ z8aA=bl-Ip}o7h?nHMsSZXg{Ud-SkG(z8O_;Np>_y8piQ4>-A7s<)9kb!3O?~aDFp}GcfqUYV479CQM=QctXQ)+(aEi@gxs_IFBnfWSJm;;z1J9@s&^0 zi!l%57}sgWdg2p1(($KD7D|&k?j#~U`KYN*>a>;`a*>OCp)y#ucwhHG5JaS(j(NGQFv=X6a9VoOrgrHnD%ra<$0L*T=K;%{i}n zZH}K7X>4b%(} zqDswXc1F}rEoV{<27)aDk49@`O{8G$0%xt(oQBnK&80|S*nF*QaB2i|3TbdH0znXM z=*DhbA*hsX*^KJhWDwf=re&1kslow%rplByC9AaRoV@LGz|A5uVj;+?bfN%bZ10uA zN+C|JG-d;?5(wT-Lic8=A@0h|?5(e=Ao}ucAp)x>jL+W=3n>JyDWs@0*rB7}-S#ESOo3ant};_i#QWk&F>z&Jzi{Ej)+ z=hL%_ z>lgM=82s=LH_jmM$8zo<c1iqe# zLdqZwCIk&UkC8G+-s=Ba|t6AGY(`_xl7#vnw^01vK_5&X_auB$u-ZyUQ&!@%)H zKjHAgaU97}@yxMF;E_rskHp+D#ZD|ofiz3xaUL`q~eC;tp6N5fy>$^6jC&*CYc z|BfGY>I43umqWAX;!K& zJ8Em3CRf*zEh`YEG!SXTGA?y3Y~&KBZfY)w;FLap>gBMxG%3TPuz<0DM7J5x?}|AZDi z9jG=s;@jA@+bFTOAm$QlZbByHGHj$11z|auBRb+!6zQ`*_Y=DAGZx1y6P(Tz`}4cp z1HBBC7mY{`=^Xy$^Z@Q_HHYbi)OACZX{P6ih_#AP)>7 z5)?NQ+9*Ze2#(~)NL~~iAvf`AlpH_I9LxbngH%UNj7LFt9mS+`S1gc-l#z_o9+9*i zK2P+R6j5>vAUg?4qg0eAr&5FrAr+ESw3JKZ6kk_`+^DP~$CM)D?Fh`&OfM4n&J+n) zh0Amadg1gVfmbIILS7ivi}F1iC|MMkc>Tgn+ zmYy_qe)*PyE@CBoqIWHAR}3lu5sE4c&?;BqF9+BFVO1*|5Y^5`1as7ID#PPbtPUCUjs|sPy%OV!?sTDUWZsCec~lzq6=DLcg)Jm`Yksj z_6(z^H`(xFF;=oPwm8G*W0CV1N>*e?wq#G%IRUZtA|qz?r#kNqPj%uVa@HUQNF(xC z5naw_e^%veD>fR4Xm{%%ItPyrxo_nOMW9g=p%!XC$ZG#!5gK6;{}w?I8UYt0Y!ZTQ zKI>CEy0#U2$cCm)ylRLO+5;7Vq=x{MhzgWI+172_HbLCLK$OT0+#n8c*$teC7$F2| z@peS)?l+cEH_|umD$$%;a(~8PT4v-5GLa0-zz+Z+5uza)$Uzb$A@KIo8x(Ik;hcai8JA5!;7k#rqE&vk7~8vK!yPR~)K^v49z zsx(Cmh)k8Vl=e^sc&`vm$uuR3w@l;BOv%(W&y=ntjnX!zm85ri^UtBtEwE7Xf7Ew- z+a;Ph6wX$Xn!Fd9=By@ZGF@bvd|fgnm05j_SyCmHeQ$&Q|KhG-e!OaZ(KO94Rdd7P$|gOTnj-cv`uq#f~&l(hk-y|h2RLr?OuiW zGl^IrkoSlSNRV$!qH*t)=&e+ECyJ4UiZ$Dc$uMGLp($)(i`Q@s%fgGlIN^qqIM0HN zkMoR4Rv47?jMtcrrxeKiKsrOt5JLkBD#mCHA~uXbXZ`hvOCq=Y*xg8iUkQ11;FSoG z_Hz`uzZkjZIOCBwap$g95Gc8lGa2ZzV?IZ5YxUEG|3Xa?zO`zhs>O2~31^bm6&>y2Q4?K;0Z*Pij`V_|A|Rg`uCvxcK}g_RfDS2^TwgBn$#kS zD`&M?U*H2d_*Nr$1ItpZiIsvWFoVasf;$SW>+)+%*woott5f|gUn-{RvTSOgrcxMN z?|N?lN3ZjGsrtHx%T*6>Sle{MdJVfWdswl_iivG0mS|}S2go9hTP60jfL0D*s|^2| z60dkCSwuBeEJh3)_F?}Gu_jivyQj5<2@(Yk}>%a zGFg*NXgg4d6w$*wSh42GHWf*kl%X!Z|8?j+dj4$x!xrBgpf}{dhFDx^W{sIAyJ}8iSh&rlps)}1_45~s#PFD zvSvNPRY=k!QMi8PDmJOvvu2MN0bBOSlP5-uJW(6BZd?{dSm@o$x36Elck7ZxOPGsc zE>sR9roxy?moAN|oPC1!3D%^Cy=b<>S&yDQdtix({Vj%a(1d zwr$(2jj=AqySMM(y?OEa|3$p`uU^QLCqKlzd7A&%eLZD*y&~g%$)BNCp{YB&c8+XEb<5 z8*Rj~$RdqYD99riW{4pqlT5Bf;ruA!uoNv`3>l29sHMj8pCfrb`W5(uCc0a^jY75@bo zo`3z}_Y|4?g(t-o;Z@=07+Q=WXPjg>h{v6O1Tx4aos2V%Ie-F6&N=6RVyK~?gz`zE zi#F=$qmV)x%A}JL|4OJkmS&o1D1>rKXg{EaD(a}DmI^9A{G5uas;IW=Dyy%a+E1*e z)@tjmrKXzCuDtf@>#xA(L(j0p7He!f$R?|7vh1YeEIQCe3#~NbR6ESI!DOp#Fp41J zEh5lGHyt3=T{qOZb%>$vy6mM)^zWc7lFIR#AOqX4D4IG!j z1ShN(!2Xie@V^j8EHM`ngB8|bXO+biQ}uN`9>-8L<&>IIKtb}!W1_6`$}FGkrpw^9 z>E_HcOF{F^INw~L7H;xPV9!3!%yZ5}<2*&tNGDD76il~la>*m3$)CqmS54l2B1;`| zQ%vtSg;Pw2|1I{|WS4Dr*kE@J#n)Ol^+aTi!7KONU@T$x-FP#x1QUGs?RVci1ui&G zBjsec;U^`o_~IrVZa7JhHxbh0lvi%~7+vxQ3tHI z-oXg2qkcL?Bs}DKK?yCC5J9)ouDb8FdyY}(!^7~=K4tdc-D+*(XQY0cWicv%@;>3*B7$Y3rh(?fb zM1_3Rqd5vG4niuD9FF9qCn+fnQ3_;~req~6?TkxI1XCi#1U3KY2Yg3N6V2o#rvn|R z3l2V#-2c|S-saCcUSGdeos9g0b zUivaszg$%=he^y(?W!NaN~SW6#Y|!?>zT=NRyw35t#U|%TH?Ugwz7qYZXx0jCVbAg z|Eg1+I^1C>Vn|oJ+(kFJ&Fh_p0iZn7QZb16>tG0DnEdw1&wdsRp8~6=KnKdNi@DDT zNr8*i7Wx*aG^LUKQPa~TI?E?yJ>FsY&{oCNC zN;t6KNGS}PXZg>Mx z2=9PbJKxzAcVx}T@syCff(-_qur&PyL}LWSiO%?m53wtyFr!JrsE$J1Va zo+kj?M^Jkz?6m$&bZP;U=zBh_w1tke!1j65N@s06BP-d-WD2!SYg(cg#i&O?Dl?h6 z6lW<-X-P+V>Q+B}il(elVLXx9b36IA zx2QVXZ&amf6SkU@tXlgdR_&@+!OHE-iFK@*-!sZit}OA$<*< zxD7Ip!1ivgpbK3^#9h4Mc?5ZdGptIQr`UqSq0uY5lHX!Pw% z&~bsE!w_v3ysY-)0KGVD{cISLFQ&G)trulBW)=Ys(6^ugt^$R7n&KLlHOftHbDR5I z;6xXM$DwX7tjnBmo-n&AcbsUnXh*hZ%dY^zF_ohirY+~^u z$L_?P-FFRDv|@k%``<=nXc8Fe(1GWEU{5GmMRR{J8fWyzIQpm&ju6t1GEAiY63Go4 z2C<0K!1xd^C`&tI;+VixG8Xe^P5gneex4G^s8#f&l{|wP>cm1kXws7%`Z1904vJHr z@=&d(6et)Ksn}2X_EUE9lQ)I?P;@z$Sq?rhg}LQa{r>o?|KdlOm*1-~GqcRgI&-tq zOwDUzQ=8lR*0<;^ojlyZ&UenUo|npnca>i;fWDWY2QBG-aok~zj(=+7-`YeEwBq`7 zbo~0M>;CH$)Sq^FB$H{O#!)S!Q6c4OG-Faib5cN~QVJM>N+WACb2L)WG$>Tz z=1~5}P##zxJJnD{RZ~DUY-9sAKy`v*!yiV~A4x?8$_6jZ_G~uDH_;|-)P@t+)`Qs= zIo%e7-^MxpmOFo?Z)(L??&fY1VLG%k0_JvZqO*j2Wjl3c5yZng7lBve7H{*0g++)E z|0WUvXA+II5{PARiPb!;aE1!U6HIVD>0%V>mr#^({~zhKS>y9r?Uz6G!WQ>*P<1hX zs`YVxacB>tTkqs&CMR3}lX3}Vhb*UCyyaWJl|Z9FbHr6#$Axn_Hyb;5K|SYl(luQp zM0DU}bVrv$+QmXI#B>xDUR5_y2&bX#{dIz@m|Fa`iZNn{rwT2gjefFSq9 zAZgcM%s3&90AP>cc5x?noB&2(M0ePjU<+no54I>F(nft(BR-;GbI@T%f+R`eM^Msu zg4B47mj;Ej1(7EpDU*R~l44izGMTp@N7Q){MKV_~1_$CG4{`>05D0;g2w$XnDFS;A z34290d#dDmy;qU2lqtI>Wv=8Xw{(2AB79f||0~8fk{(%QtpY0ffK1F6X7nH|&NnR3 zr!3MpeQIWX*79cC)GgiwE+$lG*l}m-B!25MgXafN>z6V3(uV=XPw+>7{R9|&5g361 zm9EuKrgcz)h)+&w7avGN9^-+T_H`UsQ3Y6*Fk@;N*n(pdY(JGYFX$9WHG?#GgEp9hQ&l)Ss60J*ZI07bUp0i5 zGlV)2hFOS(d4+_dGlfd{giuI@zB4-#@jIiLZwqmSTX+zhxrJXio4Ui9V@OyekvM0# z5^5MdY~ks1W}uIR7*-SX$c^8(jca{2!bF8lTZnjFb?G436-#Vri3Vsf=aCXI)>4>8FsXhwa}QVwh;4cNCW zim<5OVhG%qLg$1oLOFiqS90%UFPL$ZXu&=ORZouAlvTNvPkD%_bwBkti2h_+2NQ_- zB&w8_m*p`sJ#}kjVwMI-mZ5et991)|ww49LY7D3|B;{(s+G)>qIhZNvf-g9$`;nN6`7Slcn9$~!IvAOfIhk4YIF^Yynh6r?%9&Zng|DfF zpYv{_xtdQnnx$E<_qv+BBRuX312Yh?;YOPTix2@j0|q+-9sv?$IBf!VSiLC|Y>03w z(Kx~xIDI1&nt^_mp_~)P|D2tgF`Sxz`zJruX+PI_aoH&^j2JJBadPt%o|L#5=9xg~ zS#zt=iJth0?`a$H`5VIlbV7%UMptL#L{6^g9pA-MvIwB+0YnArv_YhYnx&jplOOr< z7XB!JY7(JiU$VwEBa?ulDN1)~B%>2%BQ9b_ zXT(N}vPLvoqko5^<;aX~&;~p@NItp-iuXq&7NkXLq{S$CCnI@|)OG#nbu6<;Z}PQ^ zzz8Aw2%I2Ff)Yw5Vkm?Xd$G4DQzoXbgr;q(rcK7C=g>-xvI)40yN?2=9|@AaYkYO8 zDx(6t!7D1nn@fGV|B@~Fr-6zrGfAk`Bo5bztice_Ulj1>T4$0i!^0x1Bh#OiL16sYBd8= zqt;SvnV~2ZtPK2?Z+Wa5^=SiGt5YK~`Aap-iovnEm%wJ2UGu@#iZ*Jaf*g#PF{qeg zU^n23gW~F#(?+i5YHf$3ZI`pI--ZyI8HN|J!@J|Itx2z-W3NCg#P<3*`c|7pSZ{!Z z5dw>_2OF?25Cc;Dg)lJ1F+jym{KN`-n~2Y`?V*;_8$r5&#bizVYRx41*19Lnm|#_FNLowv1LM`M&^26u2LuzV+B z>mUho2FbV}9-5;d`nDAkw~qh`UF2gQf_G)qqIC1z9cJK_K~cDe9D)+eEO2j z>%7tj|GjHwlhg}mjEV?`;Hcp;9hqEC;n%%l052`wPO(KVm`c9%6fvtRo&RK&qRMDe z$sW|XT7~G-^drAKoiK#>lul_LTzSDC1D3P;P`B2D9QAc$!_bv3{S!Xg})UL&nPb!jJz!r{Kr**Lv0w`h+hJp5Pz6jU zQ&eMK0UCAV1$ChObi3G~y?9hlLt|v{wXO`yf$#^hEX%V@MYhZ!`V}E-Yv9c&qHn7q zHNpu#_TV03%q%M52PR?Qn71-QBFYS-pCG1q+sqSYqdYQU6(Y?a3J2AUxYlgVOQIm{ zxCKG_j*-jFSK!TGVp8pwFt? zdK~$BMJ9UyO}lB@O0=t{x2w=zz6lI1E5TH!4lSq0yGspyr@%B!sFIQxy?h$o|GYCv zlQn6RZnjO@=PfxO!E{v(yd(GF8>DPa)ZQGWaAJGvVaoD@#nLKQ;KCBR~Nmu)J zZ%7DlO6b^TMa4ecZ&@7L2iw_K>^U)T?&z*p2+PC)+YwJ}JRlJ{*NLiy80j9z0==z2hXK{}p24axdo@ zg^Zq>h{zI@4ah}7$-v09q4J{0LD|h4*&WG}TwRomy+^B``w2rG1yNOlLs3i0@!_oY zeQPImAlq>#2+0TtiADd7Cs?$$4RYWeir@&o%L@+7H{#$*K1M)>BE+ns7|wS%0%3Q1 zw;$5slfoiwgb8eKqi^d7I5K!AUPaf8&D#v)k*fugTjTQeLK!6{8+guAfka!2G67Pd z2f_wyFbJJs4$Tq`(LfHCF!{pF33rD|5NW%wtL0eU`AQbhOSVd0t_h@H`kH{dVP58{ zPm&d#D|uRcuRpx1^5)Fvd>h>kbKWd!h7N~HEqAUhJE`a5!smXz|Gj|Ty$$~?x%KHGBZ*>JmZNTfyNbZRit6r< zG_2n0N@JFuch+eQ{(7lXJ=NF=JJcS(a?l{}JO7FPV{W;mjq<=g&e! zM-c+V^l8+oO&?+1+VyMLv11#dUEB6;7P)onHnQ9I?%uLNgYH}$BA4UEJ2Mv zLWpq5?4^z!?0WR<*#paaEbz6&i@#O=7B2L-vaM&|p1m>n@#V)aRxDS2{PmCR=l{$9 z|6h6$a6kbMG4Q}c3Q=%DKpJe&k2~&w&rul zOGGh67EcRN#1}#Q&>)0rwDCq8rKn;I9xKEHk3RxoWJn@~WaJMdll)_mMdFC#j6a-| zl1V3-WU>(~vwY+cNV@cr5>CPtQ%q0FG_%Yx(^PX!|1mRh6B0M$d=t)0+LW`-Fh9|A zPfqT16BA4_!Nd_l3C(g2L=ly8(Kgm-=4u|#;A1+GR`ogjXwtIgdKL$kwzMFianE)Pe1`BS!IX+p+j!j4=jw<8;zN=VOq| zDQ8$|hADZNU{X$55k(MjdBH*)d@w>k>ae*E|1reCIcJ`G_BrQ?B zdbrj=lkGJlSc}><+K#yGYOJqj0qfjs+xj=K!xnpNvdi8&YqW2BqPDe-i1BT>UrZ>( z8KZbHida)k6$)AV?wfDFtLRYhz&AAfaKsVUVsXYBcU+4q8s89d#V1eva?BH-;_%H8 z*HLi7{r+2TSm%!WbktLS`@V6Rajf(D||bcY-YI_M=T%IG4Hf)}16kx()o zrI(UlDW;j4zX>Ou{u0WprhZE5g|LpQ{w(gBdMd1~swxU8@V)ZtE2y{%|NE+v8j7#J z;AhILvfO%WExlfti>|%!n&Gbh`Okhl|AAjll+e7FAf^?MVITt|^T6eiL?o86NbkIW z1Po%3GocXzXhhSZ6Ya(YBYav3P1u^WdChEMs|{?JrktT2M}|gQ4i%PWx94<_2-B&~ zb?l&>?R4im;TexD%yXXfpvOJ%$wqvVkqr1e5sLA-4}R{$A1v+%Kma08fe>^cn8i$H zdGJFSA#{fdQRqS#3Z0Em2SU~429Bs%(Hu=fA{VVrA*JJE=|+VsGEnFYcnE}%A`uB9 zC2~khvQi@*>BuZaQcGUy(wIDvrZZ&{O>E+1nljO)H~HyKda{$7ko5^<-Dwkd0#u<2 z6-hCHpVGeT?>m1EmmY%8wE^%!_THoYWInBAPZ-ydV;VjoC)b-AE#Y>*^gcrZ;c~5(` z%U}e<=fD0{FndBwpaUH!#SEG;gj#H4!RlDYK!y&HNkbeH701a`77UiP>}3pc5E&&@ zvzyuMXCoB@7=X6B-N6usH)N^PSQCYper7gOLt)iynnJXlEvGtNVNZPuw%(YnHaf*A zZ49C|g}6<1OWkAZVq`bG#fo*KlNI1ZcU9444s(=yoZ~daxX5``tC1UPS%3-S2=mJj6O-BqKRqV;!r! z<~gqk&#Q?}cG467QBNuC(_T^DH^1>^?|V+MUS~Hu74x+(EA12CP~3Nx`{9Lve)$Vt z^s>L(0+227YfEf?H&Qql;=HFnIOk^S? z2!M0z=N1P@GT;hINMb}GA2EqeP;(sE%;vR1p{#L&bDevF);YOVt#YO_TH$J^x#0Ou zK&^|Oo35um`}t{n>eF8UNc#C@NtPzzqz6t72eX{~@hZ{KB z)^<^ks?@lq|1Kdo{LB;BE#GBU6{~!+s;oAIRnUFTtX=KuS0zU|vP#b106%NNFV{I@ zvbC)>^3dIIm~M#2ZLY49IF6c%5GnvRun!q*Nx@Lq-z7G&F>!3kO z%NNa_HY}v|-usBc+R#=nxHCsBYkh9L?2!euLa!eI?>9jE`7gIi*KPg$QuNstJ-BW8 z$#4ntk_RTYG0bJ|@}BF2%k&Nj7o2W!SQDKOmL@g631Qb<@LjlDJG@paZ@9Y~8>B58 zhVEr{bKKqT(Qu|ZnZYl2^vmD=`qvf$PNFf?^PU1b5sFgGg@SXzU@ba0KoI^SA}Czp z2bD2G|7f((8t+Xw*1gfha2zp-U7ts|rC9a?`BW7GIY=NCQpS;(MDGt-W8gDlOOnLW zkBtvxOdg99Mm92%IjLkSi&9Od+*9PX@)WEnMi-`J(!kHj&mp$ZdxaGTC{0-7Dqd$M#~mOE5LQC zGZq>H-QYC5LV3)*^%Rs@W;Sc_AvI-6)7 zlw*mkQ!cJ!E>RE#m0+IdVuIdD#_3wd>EMF1Lp$thySDR{ zF(3&NAvvT;s05Yly-C=T8heEO+Y(6F5}7#h=F+jOYG;b*k)Ibmn z7#h_+)fQ~L&I^y=VU*Hh^mP*PV=m|raB1IQ3yYTh(DZ&oT-CA zw1`1eMEi8CMr1^mt1Qa`F5Zeco2$g8*e$#eE$n%%|0K}(=^g_uMN-T~oy#msw8d7e zE&NfsSj?>78X()U#o(#|!PrFvT8ZV_x?tqGVI0O)P&p-tE@fQC=^_HxfJW3fFR-!E z+_2GWq&D2Bwr=ybZG5{DO3iUBQgd{-4vGREx-WJVBE*x&d1O5F|A;)vL$D|E$I8RJ zV-QG!EJy^QLC_1m8_cjg%aDgOruCf2iL^)(djb%1(-C=_Is3{Q;YceWh&#noP#H-W z(>)nWNtIklmTXDkqe+^yNkqL#IZ3{qB$J+W)JAo_FsYMIq7zV}vN1WzO1%?Ec%`Le zN+-dkF@qGTl*+0Uzwy(`G{XWcNWZTf%T|GcIhC^@KvU60ZdIG6igUQ!aPiF?bd!t%*PDZ$dt^< zY=?zfK^FWNYZ{r8i9wagsLrgxgv3FciI8C%&7LXEi7-;t|6EPhbSb#ALaiw`t~ndv z_|dZY&9UK4g;m(w^i7B5&7TrjtU1rr(Zc3{0;Q2RG>rl&@Yv@hoG}!*GqjwrdK|I} ztCZzVmd%_t3qz^O5iPV>npK_hT!_E|gZB)Y`P7J!yHB7+iTq^I{e(mdmC)T1P@z$qzg4Hgg%l_Jv9B*MS@ zjLsN5?D(Pla!3Ax(s-0oT%gkVxKb?bN6gc_F8xwO|ClfZF@(=FqX{X!hP*dnx>*>3 zQ#+C)HoeFancdZ)Q;ponI^9T6=}J!_12#YsKjpnZP2OOggtlzSLrqjTQPewW6E*os zA*xH>{RLP)K>ykDM8g-vP!DtrSD4vGE>#_!-B=hRTXulKu-;G0~H_G*$z2)@)f;2UgZ*owNsxR!f^!I;hqQrUN=~ z1VGVN3&cQg4Pg=Hhj10w$ShZLU8sgiS9Oi37j)Nm?KOG5Fng_o(Zg4t(btGDQq+`O ze|PUY8j8)vDy%|l>l%dJww`j>u<=b6|A^S!kk}}O*eceI+>GKC;+i6^*|=#p zI^06%XpRmU4r2<>f?J%gI@ywCW9wAoHEdZq?#?r%DmgT!CqPp#-s6aC&yMTa`V88j z9oo9xPyWn_px_Ax<*nG#!~zY_rq$5X%GyZwM5}cl06kE!z}iSAP^QpiqbSfwemS^^ z#kr8h3pHh?3$EcBjG0ggQGi=voZGogf+P?Lmb=>}$lGOn4Ht-xzzycXC0rH=T*E~n zsp+;O{zkzyudX>E$1T#%_*V{U#&v8`%*|XV<=iQy(#{24EY(s68xUXUqSJL5moWrG zD1>!Z-9WHGGcp4g;NqaojFy{jNC|qCTJ)S-cNZPd5$qg zm;~fi$zloAV4Y}+o@hv*1W=kXOhqzJFqR{`-sRigP72CNtyCb>)Fm@%P_ju^VoEG~ zlrIaj@QajEl}h(LGx94xR&7<^4HZ$j0`_Y^S`|xK9fDi!5LuyyT5iH>m zG(i-OwaTQmT4Ps=+BIHFXL+4h9HiHK-N7&rgTuyX?qT&}&6m2yn<`?0B`;+b zHz&?wECx3#&SHrD?1lwx%`O{+|E+9uhl&+HT`HzHOHc z&$<%hJM3rFPB%Z^otyz=#1iD=DIWYBTH-QfC4fXkh5<#kIjLpZrsd>LmSp*fTB*fa zwYZ+n%EeCx3+%aWtwoBu(4X$kE!yfW3{_?KK4tgTEVjJ~k&s(ire(RcWn0GOT)tag z&LG$bW&t0e8$B-@eLG`@yTz?Wx&x{lC2(T?4PxF#XpZL7EXRMfE_Ecl%GD0T%Vv1o zW^VReehl3#9o=yz=W^}^bVg@&esR@pkU(Hv(kneO05~0qSvQhh+STXW#a$DTD_Qlc z6ywO=E$D(4Nq!>(BpHN1{{_@aC>C;vhDz{+N~mZocS}hPvXSm+a!@|*mDDi-laE$1 zON>LJwJcr#sxqYBm#&7+u zdHrT?UEbyY4)6hQ<{N$R1W)iGCNCvs;+_(43O6C*uyASq;pXU|$z@V(e#a0OaVd4Y z`M?Em4rdhSqAv0Uuy1h}hw;@lqj{$1QjzU8DxK3wksjaYwjUASjy+lB-GfGQKJUs- z>8euc75?kJK$UWj_Jk}qU^PLdJQ4HimGUxCmXB6^OFD;5!pR?tJ~scc;`5SEZA$H% zX-N@3^_`Sn|0***$AYc|UY`yoKM!g?N+#F#8$;(+Ga%kUNCZU)R3npeNVjwe=KXZq zmP}{XNc(DN?aNOG^|DTWQ5SU$u2xh}byko5PkVJ(kM+qsS9A>-Yr3^u%k_6f=NayG z8!l|aUTnqI;ihLcrzb)qY#L-{c4vR~Y~(JVqV~=9Y-;EB&&GEB7i}p72qOXq5-e!Y z;FE+37cy+<@L|I!5*0>yGBKgVj1!@7lp+O+$B-aHlB{C#B+8T~wP;z%@@18mEn~8z zNpq&koH}jpL^-9W$|*mEdK~$&qez7uAu?_1^eNP+RHjm$3g#--t7613>FV{XldxjP zI&o$8|18?HYS+4I(zb1rxNharrK{vF-n@F1=;-TL2aLdi2M3;E*l>-+hZi$$?D%nG z7>^}G7Hl~13mBO-zv%qpvS!YnM`woYI0lRuq*uR)p}O4CXWXe<<9>}h zH|^27{pxL!L=^Jm%9kf;?)-U@y?K{Vr;g-0_UzY>a6jVWJ9zLc#*;5!-h24;-Pf~U zKhQk<@-EEJAFsYW`zYKqa_R5?e}5AFrxAhr?I(l~ToA#97Y){72ZVO$p~oJ3z;a86}y!iguLcw#80keGTZs+?w`DXOiu`p6@V$Z9IAj?8gu9J%TmM;pER z+Qu4d{0eNa#TJ_evT1CwY!+Lvv}T!CpthwrEfhg`Ym`S_h)a?bCSB3R z7)Ks?h8b)O(#bgSQW|KVllBP;zM<&5FTefvd(Juj`U^0@1iN!E!tNAYu)vFc|FQ|h z5kssA#T8q8F~ykBp$Q!wdrYy%AygyZkcDG0QwN%{9B656(I3 zyfe=|`vS0pp#D1PM0%vIns!8wK&0Oy|p5W;8+OQg#ZbN zkV4*Zb{%Qou@&2GyS-Hyafbnh+*fgt6;=T1J)lNh6!k4HWpARpFgg9bZ}R6GIg zRH72)Fh*etQUJ>&Cp}q8Qmsl;s)E#}Ow~$PmFiTExaFy2HLF;eN>-1c#3W!Pt6lBt zSHU7yuY^S`V;w75%5oMKurMuZL5m|-5F|Fk6p}7T0bOGlL%C9dE_EI059YiCIWRen zJ_)K|egcKS;>oXt0Zg9sEEvM>88Cdob6*aV7(g*5(2I2pWFb4K$1pK6l`*uTC9@es zBP!8}^5bU~y{JWprctDEv>i+PDAb@PHL6t&YgyZx*1BfKu#L?RXS;*h&{l`H(X?%H ztK0PO)3~9p(r3R3b>9pyp^CtCcVpDOxn8Exe8^j#50NULQ=fsEf1`I{cBUE z5{2mH6bxdh-u1eYJ+gGKvE3UVWXbnI3s$f%>bopsWYfOPZWeyBf!_?|XBo@jPcoYc zEny%CLD1Guf~s8&YD}}h;JmiBz$xHrC|JP@W>AA2{Ot`ssDuzMVT9VD0Sl8WLlq|X zKJ8)Za&K54@aS-dKinx0ecBxa?PozrRAPjhSfLBSLPHypVis|cixFwDyK zU(A<`Iy$2vexzR_5ouj-Oi~z9lFjDjvA|U7BOm{||1BpiSWJg}u$rjVCPz|u4Q1$+ zB=bZ`OQsW(9!BM#Iw@jH;cJwnT;-!q$xc| zh-(aD;4hK>5C}C70-fYo=b+%JPkF|3&H~dXo(UF;5}R020FBr{1I;mvA+*p6#RMiY z;m}2+jG~TyG|lqyGK^BX()rNn&^n5=kAhUB=pgCTOo~#jdCd?kZRtzv;8K~ct)?`+ zDNYNET^~llZ`u8+P;o7|BMbzFMCG+XSdchj{}+TjN)>iekquq*Se0_2n<})U4OM45 zwLAhLwpO#t27a7hx1e`r6lw_|0!1(jEvj z_qUBnA_KaspyfXr*h)?D<3qf)5H1Jd{|Vo!ctGU{%g@G8v%~i||-Q-k%fC1C_hySht72pKbuHnb80UNMs+qEHE4;ouiE!9#j zTeCftv>hQ5TGiz^j#BZU6Cwn@IYn88+ee7R?2t>l;RNu&mF}>WyM1Bpm|IGa3sLZu zm_#8ON`<~rMPV71zcB&81>C^RVfYlBU6>ETC7i+yhGT3N#IaAqeHO%hmc=A#$N=N%RL9og`z0V9L-V3AdXPZ>0HqH zoX<%Ya{(O-;Rg;4A<@Byb0wY9Egjzk2(CQ=udPR|d6$EPmw1tv)@_|Fc%3q)$a@__ z*vZJ)jZqmP!rAS}ewh=0oq;yK9sk_Pk+=yGSk+yEK}FvI5)_!@^gT)6Ws^`49)w+i z;pI*vH4@_;ldlkyAdp`r`3WX*TIGS*`DI?_#o6YW80mrDCUw%Ibc(0M66)1htK3+s zJfx|(o-VmcFU=m0!OA1xUhlz5+WFq^DH)Rmi!&t)vtWVpF(2~XdfA5 z9~nGeC*Vmic^|0I6F+@IzNlZou;0MMpHVUl!_1$FZG!zt4E_-s|7A@7`QJeSU?w1% z0A^(Y9w1jnR0DoxMnz!IOdthTAUlLq(_~<%T@43zjUpsMBCu2*kPS?^)Ciu93Azmm zZp8|!U>n-a-N0ZB&LCmpqW^nv#}gLY5H=w#5+UVK+f`Ln5>6%(LRVsD8&?rT8h)Ea zaOU4s;T4kGxdG2j><&z5l8&JYC6pRcfUGb|tLN zjHH1jt@4amjwM-^Wv5-BT590cM8l}LW!HRQOO;Kkm0(`lR0_fx3(8tx4klqboe*Wj zVH(a364hk}+y8sOM`JdXQ#~8FdJbidYh^N3wq9lwW`t*c+v>oMM3B{?h6EV$&P?DA zT&X6$ej&ZhD2*mh@+8DZ*rvcH1Qo1d8!o{c!Xa-u7H~GK!#dV*N|s*aAz&OQb;d@- zEhlqI+;VDca~2|KSm$?+7HOf@C5{Gn#?K;3VgiZh0-Y>rlqUqGXKuZ~2#kOQ=s;t`IC59d$MBD;_95(2Ok1c8Feb|$lgHK`}i9s$XTq)&(3MegPjJ=qbVuB-l>FKEoB#7zj z-AS32=_L4ABe?0C`ra7`LM2_oB#7Ud^~xFWN|W(vpDLg8T@y8Zqf1KP--YIw+2nsE zi8h+kAUuNjB`^7fUO%Bs?j~=RMfW(Y5H~Eu4(DD_tjbyJ#eQ680V2mT zC&+fEb(RKbU}tDmG0gH$A!cXCL84)}#uq=3B+{&Espkur@oLM~#m>V|DCX}S1lqdw>?Oi(VE#GRH-^Qa#vV`KL z!Qu(a;l{x*iK&v(i{wq7(zwGgJFZVkDL-vqVr%If}}Hr9#kvgwf-Zm#GlN($+ltmKtllNrV)^hMu-&5rhcQ%#Zq zqaLq0!HQ1ai6;~ciD57H@=HHes{ARm_2L=yYVY=fs`pl<_=@kUDwL|2@5-z%q)FP% z%xcb56#K%jr9EK$$}d^cZ~dwz{_1Z^xg|C3$p5NQOp)LKpP*kNa9}F%0w;0}BJ$w; zTHzoj4-#7t5`?vNYf>|txPDIORPY5y8&qeoVj}ehqYeir1XlmiMSQTks%sR;WDR=+ z@|?s8&z0}Il?%H>zP{U9)m8C`bseE0-VLloSjEA<;SU3G5D&2s7qP+N;r}3}9APUl zA|~g=WfmYVb{`Vr7Ka98FGk5O25WG!Z3U1Q*H36&B4e~{XImmBqH$+rVtJCbdU}8d zly+y_ED7AK8n1EB!m(`2HXF0C9>RbQ)bVr1KpywD(GKV;3MdT`@(L~JAtQ1F6V4(x z@-Pyk6J3ZbXx$_$Ba2wF+1dz>l+oJq$cm;N9(3~Celm>8gp9`WY~nB=aTzPavX{m3 z;Q1)v*0M}E3q1~>kuE~&x+yQ~(te+c}0m@d_co#@G)1WM_0r0R~dIca0BumKzN%J1n49KgvIJd?A$#Qzq+os7!PSv856 zbXg#QX1U}u8Mx>f@Yf%x?jP8R<_$E!2ui;EBv2Z3rZ#l^?aTE-?@~TYQ{LY|RWy|s z+C?WCr)YG_aCEGOG)aS{NkibR(!>0!bV#xEue$V0yCty#@T!sEk=!)g^d$lV=Cd;0 zU^SgjBR3BE+7s>|wiR1^C^fTPRa77P5fU9OTJ=?HTN-vXMrczBn=ta6b?v0JX~rF< zdtqC5I=vAExX^Q7q4!_8&RtVM8}e{s?R9T*k6*ufaB`0w3O2-ztZW$eVMnoJFUGEe zEXJYM{M65PX0iUn&t_Y8$bAN6$OZ#tv3i;|v}Yn}pK)uC0RL&bwrkfmY~MfyaQke3 zdj)8_1&jb;Bt~xQb`7|OZ?AiQx_}-7x6`r^anlFT9k&hsjh<6$pJ%PsCXt0cw=Bp4 zEzm+N4E%I!5!iufe94zIN+XY?s38D}+Ogdy7w_#*6ODpnm?#Af18+LIcQ(Pd^GTC@ zYXN;r*&{Vxuk3d=i*Dy?$|wCvhY9n5dlYqw!xcN7>ehvpR!4{z-D{bXcayQ zDcdAJYa@@lX^-O`BRs-Di(Z^TuTma)^j5EuuV0d%L;u1MG(`Iu_fB+`hs-TmGyr0G z`D!_rcV+v2IjxR)1eQ6c)i2bbxj3l#ns?2q`2kJW^xBw#oTuQj(oM6r;eXiq-c+qm zQ)`4Wa&ZL8x<&gK}Q?jw3sD>}Dk744IbT}yhrVxdWdlcit!?XY!Pqg&kB z)uy{OUg6aYdjt)OTfmZfsl$#A zucxg0V5eqWaj`=NXq#MS1H=r0GhWPq@#4ingbNuqM0gO!K#4PI)R++iV+@B3No+*e z(IW|wA{~w#(P2bNl`BtLaOtu_OqnxhzOeN$Mw}$c>c5K;Dp1iL81b1%TyLtBx5@h#p;lgJZhiwJ)QzlNFJb5B_|Gqi>``PW^j~|o(>#J|R z0u4N{Kmrjo@RLsvj1R&HGkFg_3L(M7k^c-e+)zD8RwK{HJ?-F(x{bL5|gU5lk@AWRv*%*_6{xJ^hrQP(>Y;)KX17mDGGr z&4<-iU40eSSY@4+R(kTG2iIJ6ZHL!heeIQZ%o3SOH^iShh2UdX11O%qPLoDzBvlrpm1_$CztGb$|7|=~I_avRM*8ZiwbptH)mp2fwXmmXa_8c1KHFxR(O$dev#6jV-nhY7f{D8Aw%duk z_1=4LSN#4P@KppKobbX42ORMx6kmLCB^-ZT2_1CkX`;#v5=f_rGT+>CiaHnQC(C{M z+@Od^-yC(F62iQ5k6ic2^#6fEpGc?D6?(m)*h$AIB-~#gi6o9lNT~yqQW}1x;)}P* z0-Bt!fcckHdMI6jAA&7`=VS}$|<6r8sDj{R6c(yt+?_^;P(CH_uqcoe~XB? z=BlGEyztViufGBd>@WdDOkx1j7+N$&GLZ4bWGZ7VY+*}VoB@PqK!XP}Xo(GKFiq3I z=9(y(?QFkcn{R~k1mFy3I3N7rb6EHq7QT==G1NkJu#+9_2&p^cAx|50NFMZnNImUw zkA^%Hq4^95KjiQaf6UPzb0pCdpeWOV3M8fjDTs>maZrII6d?;)XhUISPY}~%MH#(^ zJ>+?VAlPt;V5y^6=Kpxci(*8HM=-)hf5>Bwc*vt3ZD$Ka5@eB%#5372sS9L-4U}Tz zGe-tZ3RSX_mOw)zOWx=abu5q+qgW;>>S;}R0;QVpv?o5DvQBw|)0^ysCQbkfmVp}7 zCJoieFsuQ4QTYGWIa9u=v( z$r)PUW>0u60jhVq8{ep^H^d>%a9PdjRb9b2uQma4kDDCj2BN#l#g22NQ>#TL!dB2x zWOiy*D@0VcI=N=Vcd)BmTrsD)+vSydrgLlMG_nyAcmO273kmREU=rdLk9Z_7-eZ?% zljp^R0h!G#^H#zT)LoBr+QUfqjzWW>n6?F`{T@@u*V^=D6e~&j3RDg{zks3zU}Etn zT!?T#yXbE(eeuix04Tu2D5ih~e2iokxWGdoqJf&hOgi%bh|k<1G@>cZ2E7(G6-Mc( zz_}R;fB*9&@}}^+v3VhKrm$Z3#t;jqiEj;Uh(jQ)fjs%uZy71{L-$yyi}6WNeUg}; z{P^b_P@Lj{01TlcVlj&b3NVDeC`R^-Xg%zi!-mnr2|0N}M(Bxy4&R^#H{xm?*O23j zU=)cO-Ka}_{9_pcX(TO>L6Ar~l9akIhC~8YN{}3y(NbfjFxhx5T9{C)GZ}@GW@C6Vvr%ms9gu zFaLdhnhLiSHE!L~K7tv{U>;T2R1PLFh`~0a58W6 zjj)%hq@S^rr8>15O{Hcvso|8S%2pb*q0Kd)`m}>!Lv|y}W>jE*+h+QD8x`Qf>A6K! zs&%XCy1D8%t-iZ(iTkSJ!YbCW^7X7|O{-kxI#|$IgeS7&x8>;ikerycb1>i?U_C1l z>$%mhwfn2NFW{DdV$Aq!u4!?D*;?C0PJFOy>ucO;P@c;ALWu%jLN&<8!PaSdqDkrGXY zv5x$BhV59##@EsDj*TOQ3tCB$L2gpjCi$5^&?pd1rcsEV9A)}I`AlGTlb+J=WiG$} z%W<-k`d1ksFbC+BW&YDFX?f;cGD^+fj8Y^;0C}mF=&V!tVN>#q0UMAXRR5*VB2WTv zCC~tE(11mowkgpRZCMy?oE$9?+D_8C1zf`A4lW4O(nVa>#a+xTUhwJD@MY9y@GQcD zpqOrCTIc5QDz9qi-yV*yCaw}QryvF* zuQCp?f`{Qg!sAB3BtkCalBalHPP0~y-a(zwvp>-!RwA87r-$w zegPN&0~pGY7J$JQ)=@H`i!#yT;|)5Y9q3^n_Te7l!T6p*5@IA0 zm<*4Yulb(uG<1xRrtgEKfDH!W56s}lrUYnIs%TW>O3vW>#Q%>GB4HAiY!V9O%FM6I zOleM53I5)1mETki}+7a;_S>WWdI?i02xJ62v7hsq);#f0Ta*x8xxrz zZ~`Nf&nmE*E)WAV5Ydc<1Iu9?#vz=-AzBwLP?P+X^NOTI@#1Lt)tvq{bNyY}qxDusEiVfMuq?ihz;4lv5 zFx~2~Z|+bJ_3&@{&<`O;au)G)2+k`?DLM3A1084Ww z6c{IB6m^l|L?YvGXCxZJ<3<7{I)bur5fwXt6HLWrxxgB)PJi-3FSd~zyYcJ7F);`Oxen+Y z(b4RhtGRk1?bJ@XE~7NL1-s&I?&vOQyo(?GuBbjJH}tMH269dla`2WzITms{rh__W zD83dCB5^1@Cek8(h>V12BR7vF9ZWtv@`_Y)KAvnoO7e>=&qGi$^*G^CyT~QONG3;h z4&=a8-M|fai1)yRCwY(e-r)E2VIPKX9i{;q=KrXUE-8kT>hDYdMNlAQP&hCD z_%A*VrBV{pQX=JD7bQb5VKCb)QXoYzcS#d0Y%w_{RPM|%19ns-lVG2TGOfunc?B~w zQ!^E9ML1KOqy+>?)9uy?T-@o>RMTA4g*7+LsqiVEVpBF}Q=phMNmH$0a8uQq)76kL zI4fqNev>$jlV(c>q9~>}S0-UzZ3$xrH)Q5uazkd=5I*xRPlM{%lC7o8v!(_qJfD_> zzOdTJlc&%VsH9+Qy6rlpfC_@G3589mp8qi|%FRCC1**<=4%JORo!}1tra#|}4*?Xc z!U_=a&8_f_cKA&}`|YjZ%0WvfNB_zZ1uGEu_Cj9=dmPS3L#M7f)Nz3a6gvX3NgXR#J(6c<_IMh^}`YfeLbVhMaSNQ3U@j@0NHigr&H z2ThhO1cvIM)VHuPxU94r0pl2Gp?JX#xsU-FycA5=QA~ZIOyBWZu7$eP)Y2}fO>yiB z^l=~c^fkl_?~YdRfWvze(oY#uI%vo`v||e#&+!a(A}KOa9REQkr!Pr{DoP9zN|3D!t}r#iU})5Z49T&cPiLj2zemTi0?fRmof7Z!XD9%$9inW+@ZOHJGmWT;pSlHNjH6cwXg9&K@OS z^R-^@RYTb9_4@VB09IfFwqWB}Rt{Fs6818Og_|}|(K<64!T~fTwwy>aO|2JPGFD^f z$zwT9WMyz(+=gUtFt;MPHf^(D5=v!zusL%U2_#zyh77yRnaQ;(n>n(Dur*nQ{Z%gNI@iq}7ao{xZ5m9Ha z)OjEZ3wI1+bs}PM)wyvUcd<6Eu}BfIB3F3&S)d!ML_K#!5BhUWPP1NAbYGElZL#D| zmnCK{bt*z9fRUP^3K(Vg=TytJYL{Y^5qC#=VZeg7eAgQ7;x4FE8?SVDk%53{L3tBH zc^TtN&(V2v8hXnV9ce}_S+B~Ry%NHSMgM5>^e4hgfoa1~EFHo`LG|-@Z z881kSR7>>@ z-T+lmRj(^JJpTGScqp&?hz$hc62bxa*a01+AsT{sh;=nbL}NRA)rG0@yBLX)f~E@+ zsS3itN~)v^tb`0Ms15$W4*&s(orN4M!4v4@K9o2wl^8Cc7?t1zFJb8}VabX!g|6v3 zLdq3^={k&uo0kYsFwJ-{EzFnJn2r7QjU7`}9#D>_n~v+)jtkAuG_#vHurs?m8bT8U zGoxZp^J2vyH8qw66S)QNX_58GpQ0et9{CwlcBE4cVJd8VJO(Rd z_Iyk^lTn%1g#UJE_s-jj%I}l}mRD-~wv(s8M%k$C*?3tCy_0LA%{kF zZKRC(n1}5NpUx}-MlId~NSzr--vtS1+y$qZnyr}**VYNLnLoLCtNcc8>5Xpdwww`h z5dT)LERH~z97jDXcNDjCL<@J)>YgJppDA~s^Qv-1@vuN~ayi1V3L2ryJmf%^p&Qzv zWwCTkZbeZy7dJ<8=A6#!JaS$)qtDhye=fE9{7A0?q;I#rnXaU5lj@>WN`b3NU3z$B zTBes*d6D6!Ctau4k*6K#oZQYdulF9^)b0k4sf#1jkDAog>wKX@s%a>`tQrj>QmeaK zzcx%!!T)-Q#`>%!%z)AQLD0I34CKk$I#V?jz;K-frmI-r9rvHQo z8#;WbFcUq3YVbYxkVqy?p!b#T!bl+)acF8y5V@@TP&AG-1-Xkz>clkS|8g z6q&Ne&73#W`3yR=Xwe==o9^7PpX$}DSMz%fJGSiEv}@ajZ8o>=-MoAI{tY}Iz2U@* z7jK6=x$@=h*g1dBE}eAg<*Hk^J} KX9TF-13$j} z`S8QozkeT$e*IkdbLkHTfc^bPAc0XtVc>xZF34bm4juvF5m7`)VTBMHVZ?WOBWQhfR6mQYajBo$9Ec&LL87WiL)NIZ(fev(cqsTWItu|%dz zcwwogo-zSysG@@EM5(5p+Jq~ruFC4FtGo(ptg_C!%BoG=ifgV)?ElK^t~&f$L$JZl zP{Rzy9$PH2$1clkv(7#XZL`8oYizR3!hkIdFKo+gx8A;xZL~AQ5W@@Pev7WLFd#c^ zyTZ<}F1p>4Fhafd)=TdQB)qUMwa0e1kOtHin zT%17%8DC66#~xF_00Rn)d_c)2pL~D_;gN^{LN)2ykx!P3Ap&n>jj zvkO8G?E(u#qgXW2N(*ga(@sB)VT2q~NCXl8aq2}Kb=bkR9$xFQN7%BAEekDW(}FhI zzyL$b+HSuMH!!};?MpAdAcA+^hV0Gvd48|Qo_j_a1?QPxe*c+e;!p&kc;k*g4!ISQ zOAf{4mR~+O7FJ-vdFNQjxy2SltueYvZLHBo9ICI*dK`_s{(5H)T|_%4wsZ2y?YGlj zyY2=_bdW(44c`#(!5i<9LdWxN5M_~-Hd09@q100KF};L+_9~&lefMx0#YXt)xko-3 zV;FS>oJ&dJIOC6RS;bc8cO}$UVF}X6Ba@KhoH_oJLk_)wqAqU%#a!5OK)@)lE`H%l zUi5+&#Kc806s+K43X+-3bS5(dxgbHF*BLr^L^7o@jR{YPLe!+DHLh{ZZC(gN+n9wP z`JiENZivGi=EgWYBo1?am>lRpXFBP)juEw!ooH|;JpW8g#CXV4h`*_aJ?){773YH= z{7`CA1o97~zDR}tgi%psETe=b^faesXhTbCc)=sVZ72 zlUBCMm9A_iGo2|5S>mduHJ7!nXi0OL*u)mMv?VWZg$rKKGFQ3IWiE7qQ(f%R*}K#g z&TiQYV))Wm!}z5ydXWHP^h%fqMu4z@CTw8@-T!CB4vJ8Wd5mK$>sZJ{rT~;lbYu+h z*g;=rFPZ7!W;AO8M{kxXchj+!^U@y!r{2*i2vke>DkZg7SB)8VE7IjID}eOc|QSDj)7 zuwrhkm-C!i;S{>GmTo0&I9=;hClc7nwGo?{9rG@NyH5;6cecChLKd<+g4mUKgf(99 zGSU&j7VmhP0bxf#620l2#Cnv?o@Le0z07)VPGKNJXU#A;^WEo6Nui43wu)M(aCItN z;)?mW;uZUa-d3V^u^wI-}%n{-ciD<;@ATb)z=nfOX z@GEbiTYTCdHJeRCXzqTA~6J4wR?{QK6Mn?&21~V9Q+UQkT8-B`<#&%rFa+n5Hr&GF!FG zG{35u&b$>zqv_6RTI-t5n)95mb^okvK8srI%5%2jsZMZtQ_t}1);Y;lE^%UuSt8{# zI02n6jQ-1C`N~%Z9Hy^_0aTy^Eoh_>TCt2xjG-UPKtmlmGLlKOWT{@61zwHOm&wd# zZLT%1+|1D>C_$t>qXE!(#?oM)G{VHz5F0yGQ!d<;Q(D{FPQfNNvi0I@L3LZ(-gfP` z9TllcU8+;j;|DxQwR}c#6PmsnNv*CnOY8pXoqX)!m3?P(#8DYDR?GE&B(e&@c5c;bHfOGWaTVZc|+qJa<0p8zGeKnJ3{ zgD-y|2ra1CF+IYHJ(OY)q4>lm2C;`vpGP2(c=a7FafgFM`axb;^oRWXlAgpQ7(3D_ z>CO_4y>vKCqG`u<0wpK!#7Q-=NynySK9bv{=gxng5xts5P#k39LR_>&|qpKeHB{O+rhnSli5&HvtWR&EhSIhG>cQ zO?B32!vZgmhEK7^Fb#ug^m1vN22c{SX#uq`_#%Oz7HSxyP!wQl6fgm&<}o3YY7w<+ z6jf0a@M@M}zM7QA(f#yw+>LCTzh*0}=KpoTnkk79lpp1>To6&h|CX z=2JgKZA4X6Mzw8slT?VXRDAPo{pDY-MOugBZm0EyPtk5&C2wU|Z)SB?`nCmWkOrgE zR{iF0a}_(NA#nz0hXuDgK&LwnHxZA(hlo{i!UG8*v|SiC5*asH9Jg`Ug9b365}2h~ zXkdI-5GK+`N&hH!iI(J5zqch?L38zUb37-Cet0{c;0f%I9BAPV4s;hw=NC-(K*MDh z5)>G-ICT|Nb;)%>i*a?B0YV$$7|<16z6f?20dc5dcG<-`r;$92;EasmUElR~(LsPaVM6&6RK2as;0doUIS zP?9*SM14zkRc7*h(8pt)1Y|)bWXV@#Nd|pK27Of#eO)qTR3HUZhJ97WeU-u~y96pr z5Gp=Ne*Zx!l;(GS=$C%#r)I2TgYXAu?y@ZOXMfV-EPv*I)s%qn@_zsbfO?jd-(oC+ zwk_k-PK}0@k0vkwf>HFOF!vN`^Ysqdh@H%nhkEEcf5?YvH;8~pagSw)(IXNiff5?G zasQ}uI*a%c+{1{GNGDe?1y{g{9$91U^Az_<6MeXR0?^qx6 zXdm?0D3Vu?T%aJWgryC#rTC~I`nZn~HZ>P{B%?Qx6&aB&az_VwkPGRifRv_dnx+;> zrYzM>#8O)@C1NnD1m~+!U4KGH3p`XxAc^ai%O?8BY)Rfa0`( z-C~wsDQN35PV15^+mx#S*p@HjX#^E9cA z`D%xGn7e{2?3aFt`DX4EnLF5nnpv5dxtX(+nd-`!o<}vIiG-tR2TQmIr-_f z*O{FoD?A195DVv>4JSL}d0mG{5-+6wVu(*}+325hhfGLf_K8Hti;od0ox1qgd% zn#fvT#U)*Uv}2I8S#bqiQFCn-iaY0reyE3RfuOg=4mNZXF8{LWO@zRkgE5lyZc85DW{}oVFfw6x5puP`eKmuJ}ftVBY9OM zi6_W+e4eC|L}oaOT4YG(r&|)K+e-!8$9FbmT*ZDrH1+BSu)X@#!|n}IN!;>NjzQz!I^Rqhr9GS(C? z=dce86_g{f6FZz|cvhbSI?0)_X}}WwCWj#V5G2dS%yY7awTF;EwJAFhEbAF_@K`QO z64E2HDxsd$B2Fh0jBy^~# zxT?5{Tnj;8%XAV%ix)Z=ih;IbhY60c%E7onzw@D!!4Yy>q7-Mhce^@^KnHuvI-15$A-0!dXj;2!ijY3?VZ3Y4AXZ{4^1G-P&xDjB7&b@4Yb3^- zk&djqIo2m-0;q%fNjw(4DrvoX!hA-Sz17FPQ&y>1^C{w6zD_W{9c{iw395;SOzeAu zr^#g5~}!r3_$+c`h0hWb{6XI5(TX9L&TF;N)e@I(iStyts_pxZUWD&P=3}JI&_kMAxj2>!^kPwRoKi zrJx(SIca6#{2$|NdFI?8#paI{GNv*$y8!*paa53`_mDiI&o6$@GfvO-+|MQ!kSZR~ z0=-BC4P#eg(7-2r!I#jcAWh|^5@uD7DvYV+eXS&10sj_o12fYrHE7mojp=C(E1DiFi|I_|3Yl+h zQZ(QKG|;YfUBjGLB00R*NocQMldq;ZHh~@3bEBHJUf5N5g-mrGOx(n0FjY`YiG4cR zy~$NCci9q~C7E4Tov~Ala z3KE~8$LA?oe*DLZSOy*U+t{K|2STyfi|yZhUGH;98?u74`6=6(j#W*$yM9n*~VE?oI%^TNRO^nm%tPQ&`YF749=JS_P~tN;@* zk+zmLJ;81X=*fEfng(hgNY#i={2R;wiH_Bc-f9eB0Tplq&wm3-kOWDi=~Ouf%2|McC@D-ovmS>p(0EcH;}PKsT%TudTW3OI-87 z4q8-oumEx83KS?)rVvD!P~k#`L7+Hf7*QfZD-{=3#F$az#)?=xegx@Ji5-PM$q|{``4UsLe-^IAyB&NNLSUlZp<73f0k6s#P7) zaWqHk)~#~9&haY8&DfS@TcSy0R_z)!Y}LGNs|L+mG<8RgoN~pWK`BzIROt()@8G}+ zrA!pu_ivRkjU9J!OvcO^%6}FuYSd_{QBIvXfeHmm^k~qb&YeEZ&K)~;=1{+e9ZL3W z+O9|9<}c{r~4L9|8Fhus{P3L@+@G6TGLu zdmf}GLJ23NupJ98#4y8l*x8UZ4?j#N#BxR?vBYssJTV#-gHfbK7Zph)5km?w1P~i< z^drX{@8IzcGt3aBl zl~vZmYVB(;U3aZwufL}FwF)g3BlfRhjV(4=WtS}$*kuhOR#(5Opkgs9r~m_7D4q1e zi#nJ9H(YU;DP920Ls979g8!1`YwyP&$sm3tf%Gy6G36gxzWL@k+6W7dJhCDr z>qR1Ii|kKYX(gB7K#!|AG#e_Xnt%dII`o5r1gWT!B1$NwirNg4NjM?usrMnVsu4#T z5ufG*IbgFx9-hNCv++$3iBp{5{Dz1{6pn0y zXdL7)M?6*W4tJ)q9G^I+D(1oB6P2S0=VZ}~bdbp+)Ds8FyvK~~kxwA(vqk{5(T#8H z&w}JQM>-k^LKMPdg*3EB3w_9stVstuL}ZQGjy0@LL*wS2 zN?od#ziiZ@4n-+U2@{vY+~q9;1u9O-(wWYLRWzl^DuSqrAc476LIT4VUG)lD-T!o! zvler#ULlK|$~q^rqNPrDc9U4u($=<`B!)VCYh2=TS3dQ*PkuI`T=oJeKnXWce;E#O z2ou=C6uQuwwM=I_gDA^vX0VyPEMycD+Q>>qvZifRWj>49%OV;vo0W8;7OmONewH++ z4UGgNBU;j?)`1K#ZD}5j+S6hxQ<~D0YFGp6*3vdqp)Me7U^6OF8K3~QS-=KvqZ{6& zdbht-)vAEITfGQpP{a*vag~dl+U@6y;F$_%e~S1=y(oR^RwKm;NRY3yPpOAzQ)wtCXL?Em#ZGLn;+ zL?skl3;1NRmCR(OeMni~C)T%GpzO~krA-R?ATht9;E%SmeMk&D%dVidarot{+Zi{`10fw349@{BP( zXM`{s1Ca+c=3$L&gky#^9H2UOxQ-7J(1Y%nM?CV;#2xx0AVVagLK^ar<4{pF7}=s2 zIkHBOl%$S$TztC_$;EERoX5raaRrq5phVIJL4(uzY5n z@}y;2GIN>A9F(Gl$xC3C+02?k=A-pz^*(Ot3)qr}nv~g_#L*<&+C_q%MQJVo2SlbPBkc7BRHE&nt+bh()ZglTWs)Oqn zsk`b`vew()R6Z*W+6uaQ!j*J$tt;wOr@Fot{C0muL||(qpa1uq!LY^C!twSpSz0l+ zA&;GGM63XXjaybDnAL1Zw15RIWC07@^K1mo@)DTDfh(moEo*i13H8aGwXTJE&R@5fR2b9^#V+3tt$+8wS0GJv@2_Pg}CjS}9Sc-y`l7A&9H=j&g8WZNE zoTgR2^3Juyew^~OC+&Y(&c_t0~daBg$IPd2oxMo+q6xCmw)m!P?Hx? z8#Pip98){B5TrGP0k&IvwV|mPUc)F}Q$dMwnOVE2V9S_~GB%&tHCzCfKxn^vwO$h$ zn{mMxd>D&@nG~c!mO`3mbE%>^nwnx7B|I9Oa<-v?HlvX?s{yJB*tW45n``5mZ}T=T zoHlR^w{oMZcKe%kGs9OP!&Z2=cp#G$tlfzZ8*vYZbGWgiI^>zI#R`IoLkLLBIOp-Wj0ic+8VQm+x$QxT3Q`M}OAoG? z3jdi3oj3~g;SJodImbgSp4cCq(>bNsx!Q6Hpu4U4nJu9hIspoc;7U5RI4%aN3#XF{ z={j4&V!T)8@~13R%3yRsuMMqmWpqJ$XY1h<1b*(k@j zqm3RqjUO5gz2iIlLJs7B$K8lWc|;=IIK}1QqU``M#rqD$JC5nl$MJ|fEV2qOs=V}A zgg?kU_u#yTgvf~Wy!!~fio}n6;4sp&Bh%}!(-Z$O3Au;VE3wtnkk(tVlZ?G`crh4T zq#3KR7@?8e+dWCLB;fn8BoTw*V-n(f5+zeUCKDx5a=ua;6X=^hD62l|dlUGxlTi7T zFY_|?%ak??Kk-X5N4d)JQ$JgpNsh7$@9kiGp>_J<*wbooI z)oe|eI>M<@LMCJy+sr{0973OxwlBQGq1ykp*N*#g&M885fh4Y<;dpI(ny1Zz_$$G>| zl&p;4xJtA{&C0Bg$bu~3M9)eCPc)0ld%5Z`#m+z1gUaZ}Z@eu^2*w5IyTYqSzdIto%hGs6qEpNSf0QCI zjmPiEQt#MD@F2*7B#(nEkA#$oGRptFhrEM4z=MdyQ;3{Mi}VkS1dsvI4~;yK1_7}T z^GJ~tNs`2n)_c7bOG%Y{v6f_{myD6!k;&cby&khkAPa*b*(4&{Br1s#pJcwFY`&rd zlcP+N%yE-fvOcpEl|CuUJ|Rn5Wk2=vCGyi%tjx+wc{8r;%3B4q^{Z88%CaqkCbg_T zD6l5wDU5{R6+!!^U-`>Jv(`ilmSzD=Vj(^w={E+2jw7s^!Eg0jqk zL8;8FwN#VW5-cf^0nK}TLYXPe)07yVsX>O?oG%FZ@y8_WE_?)=V|Ei23s z&piB`eoN1|nk)811owQ;))B;n3#>q}kwC~1_7E>KP{g}n#QfyXrcDTrpa=l19!nh1 zkQ=$X=&Y1b(3WTe1{I$KbA$(l(4WYS2{j+rf(i^(TbQGtNAOTv%(VO2%!(UE^J&3v6BqSIJ*{F1aG`8arBJzLX98F zT+NLQcC6AR%C9aByy6gD;t`1Kkvz@Q ziL?(s4Lv|5kOAq)K@I;gLR}D#{76JqJw@#!Mm z6<}JCMCAb|{rk&B%T{%&OS&wlZKX>H4otzEG{OW|cNy0VmOy~QKyy78eTmF<-71!C zS$NHveyu3lbQo8|SKtIqiCVQE^h}L%nkI}w)g&4eBv^gDsFA9{itQ-Zd_o&^*ocK# zs#&(C3C+)BO(dkLja90x*;wZ6*tO9Cs1jK+RJT?r*)C=`tHK*mNZBN48*zifI2;(5 zec7{mobwDFJGlSZ(aBl6YMoi=*`FOmLKNEgU`RYbM5Kkds!N`NXj+VO+W(YV%eqAC z(H{TntS$H~wFpI*3m{Ttj_s(>oQNTxNJXiR-EV%~CZYrH0E*W2j^=RPF13#1u#R??-PuLR$~%LY zXvjO|ygJogeCA!>t&cwF1K{PbK+Q-4xyU&ZG1DVd<+Y;*IbP*u-jQ@(6icz_9T7q* zBuLtR*6uPgZ?z}GY!?ki>kS4q4;B{@?!cBs9? z=F>fnEQ+F^*bZ|}XVJ|LEqdqKWiT+3=QD^fO3K|l&}ZJ&Q+{3}e+KCNAYOtVUO@FQ zhDKJ5iZ0CShb-W$WQ9P@GR{XOsP)K4uk@a_M} zDp_fkmXeny%2Yb5q-3Q$ud$H7pJcdYrULHb=oAdzF>Aq>r#h64eT^c6PG2}mnCp@%7p8L>KIw) zn1zagTYrHWfXyI`wP#~Zz|PkcCc$5en4)pw%9dEfcDBVPsb1@um5M^A5zWLF8jD5Z zBCZ;V-E7@V%_9D6#=WqDL56PVmhQ^B#H+Ps?n(axNS+|= z{+{n1t)iQQ1Y3^NGTTk2Q1@{k^@eZUa_^QmE%wg2`{s(Vz;C;ai&kzrx`5?a4sgH? z+yk$=Ytkm6S8(p4Mkx@!#t@!AFlM#$#zs)P`I!XMU@uVU49s;ecgP326Y&x6`n&^O z6yH)6hh0o453_Gm@p$o`h$6Dj(lte}D}v{Q6eID1Fdz4EApdcRB=QUE13vKQe?Ibp z&JQME@&Y-0Lp?nzkMhPJF)Nplh?eL-qUdrk2QD8Gj2?$D7xOXCJwTYrOsz?h_SBqo zbK!Fm!JLvfmvcHVC7HJK=u;(CS|v%BC0g1(K<{a!ezT!AbfG3cM*sg+quvxTBb4J` z^rT*D_iO6-rSv^Zl}IdLhS2nHiq>$#)=uZ@P7iepHfvHh_3&RzR9}|{JeRg^byrt^ zR&VusH{pc2_4tngX6Kn{Kf-(UYh)Xl*{mpr8BT!cAaEeTfg?JMNH~H7!-frCydVK_ zBE^ajVOWGHF`_~e3KJp}_>o~mhbBD^%%GBBh7KzW8YEefp+c4_Dd5b>ASX|p8G8Oy zxpIV#qDq=HS+%MaQ>L$;LX9eQD%Gj1nqpO|wMmk$Np64zYhkQ~qD5<EMJZvL-zlLXfkEWhAv|cq&d)^ z&UntS39W_oLrcIpc*5k}+qrbC`%f7 z&N=Qt86}kFI9cU6p0vqf-^blLDvBw(Q zj7EYts7v&}c7yaEd=@Vqn6I{W;y&_fel zw9ZB&Ep*UHgMJ@-s=)Hwfa^VC2;?R3*JtK7BMT|W`F*khAjw%KMw@q}%#sn)jJ zZ^I3D6?4JY!owwe5=k4#lfiV%d;7$-;xZzH?lDOiFGv2u4k0*|l@j3idqyYWe$qlTjg&h{FaRIC z>!zE2I_emCR8vSWF^^D3H2MBe?ZLl*(L@q0ls!lWZSVZ<(bLqtKtc({d_vNf)V)hL z>9i9C?z>L``SZ{3ybeknmDEyLRn@=$Rk8o#Dp*m4Rzx8RuY4seHz3PcfTsh}K`?@9 zsS5=why)tE#V>ye3}6UDn8WZvF^8B1A|hkL%2);wn7K?K0HGOpg(iljIgW7RwzeDM zaBaTf4RC%#oF4*FI2}5Ua*Eg-2EhRiYk&izszV_E*eQy4Iu8}klOFQWCyVs4k9>dx zBmjXCK!Okue-32E={&~`41$gtBxIpBZs5frXaq7?zMMJIZZ ziK-xlDs*8CWT4R)aP)^U{vi-O3IrpD1c~&d#}iBPM0%E#r6xT|O71X+Imlt9DtYM> zT{;q&TG>i7jY$(`0u(K238(J7Ns9k=!V{eMbSF&El2Cq{Q=$fCr(!0miD!tzq$1@^ zGdK!U(zH~kI5nzkV$)RGY!x?Ibq`#<%2(l}Rj+nsPF@Kso$4GGvf7y}XTkGX(wZl< zszt49X$xE9D2KPW6^%{+lw9IES0W5ih|91`UGRF>9sEGAhwdw)_zJ^B2_`Uu{mY^O zOBfg)#xRF{6k{SCDaP^=1&*Nt61?? zR=o{OUmO%%<_=dl$iX$PaIOCwT`gBQCSZ;Ucg3scMCaGhNsx7d9W3f*XIR_aZX@7} z-bWgHzUWmicryUr>Wqgx<%!RHj@_(cOM&*;#Vq$?ViJw$?jX#gUrSn2knc5Q zd#vRN1LB91ov=2y-n*aVl)}IN0T;Ld93TO;fkbxEmo&=iZKhy#i zhNy)iCg;D&DFcDau*5hhF^Pfg~@Zp`fM?aL4wbQyXeI*f|x&o zAdneLe4sY0F*4>mM?G3WM1qvU6?pt26}hMi{hHB@9@-f} z{9zD-c!Vb?F$qc}$rD)Gq>+@wBqJRu6rqd~l}>pjEvHhIUJjR;v0HIKv4na+dR)q6YOkOU+Jqx-*`trsuTSVNYu1b6fr77C<{8(1D)I zpyN&GLKiBpht^A?{GzBB24?JoA={%Ig+a(M`WxWb>ej=_RdHI`ILDO|*Cx24u9UkR{x*lXzWx=k zOK2`(Tb??@!p?RML9It}2iwJtws*Lji0~wGwV8#7QaW=g46W^2RrCN5Q?yb-E|BKD|4BHvT$9!mf;MIQ^U8hW(u{@ zJbdF@-{AlFP`{$zFMtJ{1^^qFz|g4<6Bk9G*E{&ZjfilbD%_s;um?Wnsn30Q-+L}{ z*oz+yG4TyV;x|kO`O{fGic`$S2(@v=9I6n6rjG_KY>38ryfODvBqBl%a*$m}BqJMX z21HNl$YT`5ASU67QyS^Yr(7kLwmix%TZ#TzD)TGPtmZZM(wgO2q0k9<#F?DsQUJ0U zq16ck63U?v0QC6q$-8bbkFunAkfOkA-U+rJcy5^j{TIbp&? zOvC>;OtevpH^NNQ-+AmR{jxW?xN$LKlaei;XVDMuQVL35~HbTkp{0f?Oa(wpJQ z6y=^4Y1n)SUrAb0N#Y0bg;*RkLV>(NfuPayIp6a^UyD%)99^G_U7vqxpN)M8h;Sc? z=#h!^82Cv6jQ|@SaK@u7!Xi8p`%MBTNST&7iIQj%D0$f`Jqam!*_W-7nfc$D3805@m1C7!v7n*50a8k1ZaN_P;7bu?vDE(-ctprSQeHF*jL3Z@5oAgi39 z3%cM6svrxJ(+DCau+T%Tz+eo@V6)JmtJ%{HYRjzo6S&wK5BA`$@mdg?L8br9i@ls? z5e{1t8Vs_zX0tWh6F$tdRbg$G6c%z}$9&AS^nHAp< zj9LN4B!%q5mXyy9r_4lKH2 zV{y;(C?hUf=w->4YiX#~X;w`*mNFvNOhCjeI*&7AT}5C7@DyV+vS{}}WBW+sPQ;Hj z`r>O99Z?`fHey99bYqWtV*tTj+!;{aiG>B6BRWdfIx1;e#6@()<2?V;V__iPb}8OI z@}ml2#(1@mdA$o8q?dY`1`Q3zYFNSB$VO|xmweF|L-J65J>;9BhJa1T7Mvb)TqJ`` zN9$e3>wy>o#@Q|9l7{sjBzO^_1|OlKXQU<~#OoETVs(o+*mPlEYSs9j5WmkG-{pl)~ ze5EUerC8Pyp7D|bx>*7~poGntS}rRt`59aa)0`aZp3!BsddDKrL0)R>w)SPWN>ii> zX1MYJVHRelh2TBt!(*yzu!x|i*~+>OORq%csZA!bR3@{~U^@TQlRe>6ta0WzM1vyi zpg<9nAr#aPa;dMCCa~FyYDN@m_RB>H%tpngY|f?>N}+8^n@Hhiw(X{FZs$`0=Wv1> zaqb%&s-aOaXLGKsPqD1ZCRKD=&2kzQ8A2z`GUs*1;mPtLANrej0&P{T4d-dzAu{5p zI$U|CXL~y0+@w_`R-DCE;w5V1j%LMvZXDwPsN@VNDW+UIp5lQHR_x49?Z~3hY0vrS z9D_O*L98wMTxid6#4}c1N@$k%eCSEoj`dgsi8kY7p=fB$tw>~+FFu|4{6tU0C<82j zH0DJ8l-4Y&Em0hWjy8plVs6`oF5v$Oo(4f_lwwzQCB|el#tC^B zKR%uhN?t(9&}i%=Y5);#m?_(kshYkD6xi|_*cwrXb--Tq zg3&MC2_zigo$S(gXa}L{M@r^LqJl4eI9W;Z$9_PncCe&~F_?kGBpS_R9pPlAYN~|b z5s2gsdzNZY>aQM^-}!w8G~odwxSuCf!X)$v7jXhA*($DPNw4Z3ug)Kq@L!m~k}Ub3 zEfs49^OBqd8ZN=vu`(+#{aK(9+MVr5wbJFaZtDs+Ww%;jr8o+>iYo_}%BPU)xSC3? zq$|AgusHRwu*_?{w$r^XOTNBZwP@zQe#^iTEV}<36v8Gfy!_g)o#wqbED}O2YaYz9 zS*){3OvY+#72@W{mP{FktjoZRZ}MBo^6b2!EFAV!%eHKDwp(?|p}wi19gf@5B)yu{z;97)JTh_3Q1 zx9CCyu8Lky&=GEC@ghtlE{ra&~?7kIY{N}hs9QHV`Zcw8^D+6jO>>UNNC_=+zl7_ji2FMmicBxuJXOe*tPYJH}|yuYv+t z25YcdaGSX0N8XZMMp0d6Fq<4;prCL^QY#AIWgHBOSl0;)v#<;Ir8NcS3{P4g*zmaG zFuA&QsgT+Z|L|SkwXx8v5Ely(7co5@aXOSkzvhz?k3%I0Y!jnPA{2sXvP%%Ui@Z2g zYTk<#J8ZvTaTd4c7Q<%6&L+hu%oqQMakO=87HZoT7P3=0&C0ZKy}|Ju@6^4)HXZY^ zbzbMXS*OkB@f;r&9k<(0-Jx)%w#gi_z=_S!GIDaGC(}x@dtx@!N@81G9Mx`eb?av* zdvfG(q9})=Uy(CfR2C}3Tw;AsgB~L@R&y=tGAti1Lii3YtLS>Wg#0|N{M4x18Y3_w zoiLj%F|(+9OP%0qgx~&mFFx~aO=C1qR$C^w5^=N_r!;@t>D)_0FC zUDSXEp|h0QV+bwAEVQnb!tUd-3qZ~@J+GIT;zn&8{0!d3MN;_X2 zHOO;hNQbJScR(I1f_9=X@``?A{7~qD5X#fwE#cD0AFSNWfGET zl2-1jQj^&OgUM5$Ni3lmnxTo9NOhl7HAh;tMF$|UUM~r!aGZg)1d6p;uP|CKng+7< z23A^J%e4pMb*sBNU&EkZD+^!;_C2KoVe8Ys)>>kdOTp?I!uDE2#mmA%)D=H0MQQeC zyC$=Fwnt4N#$pT@kG8~IOtqD^ws9fJVEeZDthcQ(8@Kk=_%?NpyCAdM8wU4t);1mD zVHuXYa<)6VfBSHgOmY85RoWc4RS~UnH*#0`d(tZ0SoO_wi$USd<0VfwTve@gTP=2b zawv0mfpU0SppNmNvM$~Z&9Uu`wl~qScYfooX5|iizW{+BxP8lyjVh0RN1ZT+Xl!-- z_%zS?^f&JmI5G+aG)vsKbc!usMkcvLcLyYN zxih$`jhjpbK? zo!hh)ltvkl0fGOK!5M@;dMPE8HCZG?f~yV*lp#s{G0C7Wb*>_MmrQW~G5T0ya4%&7 z_FB3DdT;{%*|feHSkH;4)1^s+dUc5UqmcTdow~TXwW@od4bL_8mx{08gR5)*y2APp z%eoQU;9%dNVe>j@I&ouxyn&yL4Bz(z};$-@dB=2NoRIRTIO95jRn? zm~rDJkC)VtJehK3%avzj*1VZBXBaO)hbA$abmTz$uUDUj{W`Vl5w=l} zenI*L4Bw%5tDc>KLUH59Gqi?%yF+T{BTVZi0i1eu(4>VASH2v&ZqcTh&lVqBHg4C+ zi5F+Eo_%`;3)UY`PX4*`=BIV&P|^hO-dFzt3{b!U2`o@RRuEK06;VVDXFx=$ttgGQp+v5?DEJj(Fjw_GS(=A z%r@3oqm4D$WHXL8=ZJHTM(C{5&O04x#1Tgz=@XMZ0libuLFp94P(vFLBvC>iY1Gk2 zA)UmNP9~WI5=aRpG|o8Ycry+(*L*|NH`Ywk)KgJSQw=nPTtmz>#EezeFu$zT)+4L9 zLRYbP&Gm{~$p}_hGRh$KjAPIE$7*x>(v z_x#h}eCdc-;)yAqIN^#ZUgS-UJ?*&TML-T2kCD$9+2oT^#v>0tSZ>+nmtl@s=05u1 zgXWuY#+l`sbH2ytpMefq=%I-&+UTQ&w&!Ph?xDx&r=gBoYI@qK+Ul#ZUPo(oxMn9E zuhR)z>~zX0+ibJPNn7o;D^bMlx7|)e?nDfsyO2V3%o~s%`R?%!GXVb^aKO(Z9Ie9- zFH7;o6$hg%$H4%D3oat>Lh{Km&zy@WG>^jb&p{7e^wCL=;)v5xPhEA?1v}jfIHX$WJr|86Paj5EtnJYFBu67M=Fw$#$={5wTb_dZsL@u;*=>m zDNIkC)TE#e6-rSSN>PG>)F~hJtV*5olXa4l$Kv3IQ&loms!COuR)q#vrGb~TdL*rG z70fSTMOR=r;hmdg$ zmK$3{${-3+nN5_UGozW!a+XnzW)x{1_2@@IdJlVy)MryO=}EDc(yD2#9bN0%*u-`= znU-yBHH}6m6wx-gDPnFtH3Z)Dwzt0d?GAz)oZ-wMhNL2nsb~LT+*8Q{xyVg*s+7B& z=CGQ%(ruNiqdS7~Z^>x{E>|?dpJ?=pPDwK^1_%Iv3uS`WN=QB(C)W?>$ zyl*b@t4n|Ems-9kNJ05q1^*E9KmR>OjAA@s0>h}l%rLMz4n$#nEXW!Pv}Qge#Nly) zo0}p=aJV8AA#K1z!w#l!h1T)S3}ArW-Uj!$6m-sSxeFWPmhd*;Ef0Ep_`?OjCq5xW zPYIVppXQJtiTq(=6QP)2{U&HZ4SLWGu-JeDC}6Zh6`QfbhJ7lU9Wbs6JYx6C&1>J>4C-5p!)Q5KrumwfJJOi2Q@XR1GUK^ zgRG$*%X6M18f!dMl-9Lw*+y}FQJ&QdqkRbJJ@Ee#>|YQ2Xd|`9Ns(<*m8x_dE`{mX zW;)ZFuIRWZ!OWt76}J*qGdeu7SmCN?rok!t(X4a>X57@7mXePuwKAbBJQ|-B^J@ zmgCuL%26yUS;}UXdmlVeQRZi$B;ZMz)I~V*xY6 zq1@`0=$iRWZ&3)t+KdOi!zJ!}XV_iZ*oT7mk)d<3PM;cX-Gsbh;dQZlbkW3+HQN~? z)OT2$@SdHxQ$Hbi*`8kZtoJFlc7J#P}YgcRrYh1 zACW0Rbc)BMa+4d}5Qj34zm{q!LoZ+Ds#vwTNG68!t?GQtUe(#o$~42PkA;V1ErQRD zngk^PkP`weoUFyrKq1k@Nzu;19S|@S9?hJ{DbnIaU(jjN_{E?8DPS~h1L4V_9HF32 zEd(P*4k)I`1ZAN<2A1#-)?{sDZ0-LAYc1C_s@HT)XFw|0a4-jjjo5xoX+-MS=m7|m zE!mch*_`d!!Y10zX4=*!8g$Cqu+46Q3XizWZ_L0C2B&bwjoh57+#1KK!a%ChP2I?l z-8N@(;4KY5=c`Po4MoS^Qpc<^?se8`-vaIq2QJ{^%CF=KuJXzzfM?+v?s@bo;wXX- zDNZExDtHL7cJyry4?-x6pyMdlzoV5{dCzr}As_W}o=!KR}yo#%bi1Gh5Mkp9b=(}o&hth)r++)4yu01AT8=)@m(5}2*BZ=lG zF9L7yBCviw+gu10D|qB2V%%V<0KdGcGS7bwKkVYzZptA@uNW|oidT%6k50MbbkVtaIY(-XtgiK~BR7Pb~3`JBj z$@x;v`7|l|bn;M|3{ecF`WmGXA_e<`@=j(_RMg-@jRrA_4~#|!@xdN+aHMdM2SbXajBN;A^J$83rL;yJxaMon;n~nZ3DKq;m~b4b z4GOXCr+`Xt{D2CF%G-G4sFq3#x3CMnaB-$8s?Lqw)(xvX2XoXg4O0iK*bolG3KC@p zCjbuM7K=Rb@FZFSB@%9V{^}1oqOc4xu!_ec^6Gb>$KYmS5fkwb+bXdV3p@t`C?-)7 zpI|^M5qmCiDJJW(B+C;ui!0`@EI@00Opys(4t`P*wN|keT+tPEE-_?r7HQEIg${vm zu`^tVfp}|$z{~%GtT8>5(Y@Ht>|`iB_Kq0mV;Oa{HK3zAxGuS9Xg92@g;um0t=@W&KVpC1>nO za_=M=)%Uc3#vDmZgyd3Fg-v2oRGbVa^~A_L)lPQu4R%rx8iglG=_gUi$sS=4P{}9- zVN}}0DQVRu$8XJaNm0SX{ixDNenps;i4EESECYcN_N-Zul@S^x00Yec7wuW$G6BaW zTO93O=%xQ%>JneFHD4a4Uqo%x0_Fqz5@9rOU^anZ3WhHW^I{USVi;2n;2>V*6%G_? zp(OKICUXUkN}^mQGdJ^JU*@7*Mh0^RG;d~Ta?mu5E!a%6G>y$PeZ~hPmZVg3Xh!Na zUo$pka~;%yHjxn8bh9_d;ihm3IDN_xrZ8`cvkH4eIlrwrnd&*A6W!2_a;THtvNLD7 zb9KzB-cX0$?hQbB;wJP>JkQhO@=)OV>JZgaKL^Ws>J#FeHhI)DdHirc_fvNQPH3yA zK!ajH4fH^*M=2~Z6E*R&9Mt6IuL?#HEker_FBC&zPUcpz@H+Gr2ZMiP@$v{Lw>0EL zanb*U8fd!0OBiGH?m&n}voRYFS4V~D?FbigqY*U3j)7X#MbE==Tf=cFU;?W2?rbCJ zk`98(PCY1u9PQ4%n(lEe2tW1%@W3=o1&_b{>xu*{9~Vyn7Qk~afKA;LPJ!1T>C`vu zG(Q+pPfdhRCGw4!*B9bwj!F+BbtDi9^;ldFQHf;zc$JYNwR^o+OIDKoa0ye@K+H6i zRG+L+LUny%)yX!sR3AlAN(oU;X%M1s5bzg&Th)F=$@`KrRcw`3*8o;f1V09)mTSjO~lVKb7VYOI`C-z}2mWw6UVt>X5G1fITwjH#FV>>n-(4mdRrj6TJ zH)*OjudHNuDhh2RWm%R-?jVoMKya87W)nwdrPFc3kg9A}-6V%|&QPncb8|w63Uroq zyt9(WDrg4+lQWKXIQbDV?vwA(uLe$((KC10^J%fxc$hXnVPcdYZaz~v5nDNW2!d-T z5o`rCY{mAmGI0|%F>Td0Ldjx6*Qe!NE)|z(Lpk(raV~FTYi}{{GQ!9*rg{G|I>SV- zd3dwy=ydTqlrFfGqj5PmOS=nmaWovqS%}Chxr_+79LPF=W4U~Bbse{heCQlK*El}c z>D-Q;OII9Ew;Y#LoV{p>$Rmju1Ri5ocA;oY$@D=240rcYcX{^$+7tvZ8U#`xc!T!^ zByWR?cOfAIdHJ+YL$7(67kZ=D!#)gU@a)FQU{=`gOSV7@YMN5NH>VS6Qj-MEVx?6~ zWs)cfeRYz3jXL^bQV{;&P?lP$4~3QHmy{fZe?u5B^|e;$VnfHgNFZ4pgRJ zojA2Q6W2O(XI=(qu6T=Od$wuYi))*U$5@Mlu#AbY2-iV2*+CuLIBaf{xaAmanDEM; z@Y;e?+oo`j`{oK?R@?;nvt%}M$ii}H7Lm=6-6VOE;cYurhu+BQJL~NrG&$e?vpmI9 zt<2Lrk2b!2=ipFTc$jCt_ln>oPOxG*m1mh~|I?PeRzQE^mUr2)7Bs;vE3>*{ZQE81 zRt|2DIYa3-wH%t68AKFTfkFBwL=%#lOSJN^8F01vx_Ik_cv1hn&Muvo5$c9@T~mGqbSR%s6nnMi_&z9cDJJ2)B`X&1<;(Mfj2aWS0T-433{Lh_H+;Qprn=e zq?^|lL{Cspk5EnKrD2*@boEQHU<(Yrr+KR^ddisnyRDIHY z(bxM(Rau^_sa+LQKuJ}hZ_kERslk%?Xz5hC+9kaj#|9V;(%}5W8drTO($PAt8yNP2 z<@KEDM*t^T0$~v3rV@-@5-I@z0}xxVg&Y=;0XrCkzs3J8<1(-bTLLGIUh-w0?x}_q zreZ2>FX5?Q?B$;jMiV+M1R3+P;h+pK+nJupnck$ctM^z2XAA(xi2vBMM?ywWJ%W8O_pwMWH^Zvy8U>x z1z8NNn~iyu$6rZZSN={VNGPoNqDX z7OR;uhHk`3JnVR@n_2XmlaZj)IT(lN#bNxoV$}bh)g$Y&vAhHyNPYC1G1u%4*F7eB z@flypCxFJ)xjEo#g3viir_}EuKfO3N%Jm}&7^KP9eSbw{fq7>EM*eiA`@E(9{8+kLOtv6Qntuzj zz@`n|NV1^%7rl`dJ^Pcy`mbM+s-Mw!dRKos(#c;<&X@Q&HGMBVCq?xrIrV+p_jG8k7(KC(xuyFv*#V7LETLIZvQ+>O6POT|Rd}c?unRE|k%uNRxhA zx^$D%r%hQQQ>L$AGhxEysI1wuj_5eTM5nFWw`<3iCF`i_T)So8 z>U|q04xGP$1H(C}(xA%2hw&)JW2W&K$BxG+zO$H*Wy_H+Yu?Pcv**vCL-XlFnzZH8 zs7sGdz1p7Z*RW&Do=v;9?c4U~>E6w|w{PF=f(swsZrwU{$kCxor@XoIa?qnoA4k2q z^-eG=DcZh0k@xS0!UGylp1hy)=+mqB(^yR7_hRD9pD#a5{4n_Q>)+2m44D4_1_%Zh z1QuxEfm}qPU=#!{=-`78MhM{%6juLe;Soj{L7|2hR>!DDXz%ki!|0);|ez3xWbM&?uep~JO(M`kVF>QBMU|*N#u`0BFUtZP(~?bk~un= zBZ(=RsO6SiX86RHU>X7D6JCyK=9y@I3B{Uhwh6@)Q@jc1oN~?yXBBr=p=TBO%~!{t zb=bkgpiDSn=%I$XqUfTGuChuikVYzLE38zi%B7fQs){I_b}C8|peCWjsHBpr!>Op& zplS^>wCd`st+G19s;Gu z1=CW?z_r?CY#Fzaoz%Xa_U?YHE1K!LN+VvFsw*=qZ&v*UUjueZo{fNZk%Dtj-o z$KIQ7x!j^FEdvS^T<`%3Ab_yJ3>SQ@0_(avFTnr0tL_5oW?XH%5xWbm1tVCXgAz?} zdTFJVzM}HVE2Hf4%P6z_a;BVudczGBRM5ZyJU6_+1VCSK!3G|900Iap#Gv%jN(7q#Je8*jWJ zNa&#pV!9xWn4WqgthfK}`s=X2e!A(UpHBK8pXc7j=%2swhv|dNe)=Gf6mNX-sh^&_ zAS}(!67IU|PSEtzn_W$@y8;? zPx2B>(U{|oIpz$dQ%*wRU;l`blmas4fC&7=R2IlUtT<2;nAplwII$G4K;kP-!Jt<% zftIwW#VmUXVOu(A7P&+)FCx@SUj)NK!o&?RXE1|G8gqvln&AsL%pqkIvzg39A~T{1 zq7a7&nm(LHHK}0@YBbXa+&J-xP`u4=rbxx!5Jx!cC=PPA=$tMpM>^Aij&;U}9qe$Y zJKssf+6+;i@~r>ojdwWDd*I_9`q;5P{mJ8g0^}b7{f9sULJ)!^M94x)h(b}oP=`G9 zp+#wz8C9}HEXt6LG-)FoRp~}n3Q~)Bgrp^va!RO_(kXqkN+`85m9UJZ zCr?==6=iagxXfjV$dsmD`jSmga8oefR3|$b^GQ%B*)vV4r16;MLSMbzTtAIt%UAh*v8!PS2&qUB z(6EwL%VYl&6IVh#8qk3b)LH^<7eGNKGLo6>WHDoz%3#LRo}!GKowC`@a>lcs8SH03 zn}E7$qLOp_H&md?xNJF$I5Qu>9d=mkQ z=gOD9-fDpiTDY7V*iZ)e#ZP`LIo?agk&bfsST85QLKhUe#e*pnAqnFG!u%j&`trQ`wRaMX@WgZ5K@Xq=g(zs>?sh*BiUfxD?N1@E+#z^g^kzc6p2&ONDPf76 zEM>i!xL|$po8Q92B`s(v{C@*17#O;+3Lz zB7u(vX?vm{e)1=mhG|ZqX^Y}0oHi+*22?>6YVbB{q=qW-#A+_%q${yz zPsFlMwRTbA@=)NGF(?Hu|0Ge*hEe6>Z46ayyM}DyR#4x9Z344x=hAG<0)^>vgas2) z1%LnrkcA>uZ3=)f7_)@fHc`mtF+KQgWk>-cGcurZZZNY`JcVxP#%`>DDW4)#@>T)# zR&Vx}R7%BEM5AvW@B$!^PgNBwt3ovcM{rzqa0v%i3&(I|<#32_RuLz0iV-)mb#Z>v zi5zEFb(3)+H;SbAad{;;faP1?^AISPaw^9;I2Us2NQL=z@q z6IPO|cao;}VH}2f9yVeq$$G7KVzD=quQz+W5f8pmd&7}MxR)Hdw|l(jdpQ<-Jw|-s z5guxEe95PL%*SL(_Iyt!ebZNc)<miGr|aaKxJVrNA{OG~0kd&YkOn3s21Ng-mE2Kbj=a)1grm|((yPY@?=B7to3 zXpuH)V9-n&NGKfGfgY$RAQ*zJFoNy|YN2)m;*^4?GK0P1DgXy?yJAkcG6OVNgTtbl zG&pPbgo8QgYZh~cE>%!bNQT{3F8%~;Emdq@2r<{TP}K5J+Lnf62r%7dg$aX&TbPAh z=!FF1gUDH(F=d;>=`L$nZssNmnL>w_qABZUhj$onIa2`)u!jYc0QPoo_{LO%sBgdW zZ>CuTibyqDwN+YkaE|zh3pX~C=x~;pR+&g~b7OIzh&LPmM^|lCiVhlbhhsRXh&X-) zR~=znw}l3+XjspPSiSRewu6hxbBiKsJD_u-NtdE4*K^4AJI_;$!pJ-&x{S@}jBKz5 z!^MlaLp=gfJx@nB+K8bKVRb~xit4kWBN0C=p^l5dj>kg@_G3St;0c{z6XuW(>_89D zm5=&36x`L1{`ikku@&YekPcLLb!U*Akat#^kd|Nx?Gd}-=>3mK9W*_%qtI|h(_)%rphkbu^l~}oz z!s;N1WPV>6W@GtC=r6WPRvlgH&H_L|I>7AHDha*^r?dEQwGE_vxGbH6R?U__U zGctvtznVTxd`1>WapVV>C#&xN!DLVwl~TE@j>)UOYGuHxmBU)W6_Q97>>=u> zAtr);>qnLaxMsHGtbRs+e^!6ddVh09OZXQha`~+=9K(9KN#U9$L^OQ#7lfBt3aNdS+q9;u%U@h40|gDt28Z$Y6~laP~)(& zc`OoZYvIyu0p&2$X>7MCv)aP39qX}b>`*<(gJ{?;+NNwCr7i|DZ7oY}YJ9P17*JKn z#zsh;(Sj^Eo5;^{vp3U*o${SNrI{mGg63%f4^vX@*@sNKRPYJ4QTqb8qAK^Ph>U1( z{h76p7*+u)plSoQi_r#RdyNSHDvF_~ws;eY3);4&2y%tvIB^xXLzeATi(UGY4_d0a{ZMvX>bgeJkFX0~Z#SoyFkZHs z72`#Bn()wQS`|;xy9TLudWX;NHF*7{Ut^&O%G(wfxk7;<5OAYhj#& zI=F*o$ebnx$TFpb$Tm@AI55@LGYb>P*m-RkBb>l}Qg@8U#=XaU{IU(T+zgeSKX{x` zSg~TbFE|@AA0slM;wh4R-u(J*H-odj&7PU;hxj%$9Uz~eEVZIswOVzxSc}S$$Z(YS zwU`Ju6xR@B+ld?hcgwY`akwmsy6m=mC82Q}x8ftr#5`OWam>2&a>=~mxd_g7i{a>~ zbGmbmnB~pf9O5i$&AWA@u60gE5f=*`77xi4=_Ox) zSG*lvco8&Scj^{$@aAv6rz7nbE7YeHhY~7*U>iw8ER6@(OOg{t(}F(egg)p#ZK*rm zl864&o-rHs;OLO<8bnRhukq;iVCgDm)bGpGO5N%4`_$@CzxI2-Lb<<{U`E`5)vXE$ zZR18<-PK*MHrXZ24w7(%7bimvP3}-u~@~9hZ;Y*L^M7I9%E5Dg~O|eSYNG^typa zEZU?!@2k*FcPPd2mdGG;FZk5jUtHfWP_XB;YO0yVOmo|?ncEQCPfgg{zHMv`6SFEi zo!af)mmF=<7E-_c+_njA!I^~7T~YoLFvLdP)txYCjNQsTEhfus^1|J<=`JGxEFq)s zi!3rXP~MM>-aH@0>wUA-0x=6xl&<^atKVEuWuiJJC6cwLlkX`YR;}!cA4Uy($(H4Z} zZ5~2vkwNzL7IOdxa==1z?!3>75@nF*bM!WNP(zw`86;Wg*q{A`zUV#88i~%++|THj zN*k1Z=|g?~=KtvDzy9ct{*`Y2k^UO=kQ+AnzMk&spdRX?PU_Zys;LSPl`1JBn8@J& zK|=`x0buw0mFiWjS)H=rs?`Wr7GJ-H z9ZR(VU;6V$0yJ8{+8wX0RJWzVK9%C_w!xpm**&0B{B z;J`-=A5MbA3*^a>!$2Nm#&hV=Yec6W!}|3Y%C&D-ZruBK62ysjAYVQM1@!6vDKKEq zK*4+X@#V*FuO5AS_w?D@=YOC5`~w0+U_b)r!|y-@6U=Wu{r00E0|?6_PrTvC%b_Lw`(o7Q; zHer$FO*mb>G zpmb77FST@2OSj7QnmM9Ey$=h-*go{<5p}Jd4v&09+~7|auSXv;e^j|_+f}c zc{mhM9A?KHh8+%NV^B8s_!E#f5qacIBzEUycg_Lj6OuQ<nm74` z6P`0^`Dd4D#>5dvU?%!#qUlh2X{MLHITJ`ANqT8G;)nwdth0{eP_Dc7x@(T^z(Z_8 z^Wfv`vn7$_8MfPY`)#=6hI^K0`mpqE!DU!Y-j5y-RqmDWXNu-my?|!A4 zxCjHZnqso)d@gXBi6@z&&`BuxeIiOIrKBS2D5mPSzpARFdMqolTqS@49H3ds5*7r4 z<$#A_AXw<~KnNCQFL;q)1ub|%3}$dJ4MdAsx+0eU0kD7})Cy)yco`@>!84x$4M<31 zn$oOBhOBu_YiM&r*(6CfO6tvxfN1LHaq-i?#@#013!LA(GFC%-EhQHi!Wax=@P5W1JC$M@1I$;uqgTMly;B zL3ONRiSU!24ggX{ag^hDECeC-ILHDMdI61IU?U4aGDjBJ5s#2`Nla$4M?35xlkO9x zC{;<66Ts32G|+)A6%kBh5>uJbq^3QziA`{t6D@3MOJL;bPI>B6p8ypoK@sW?TuWCP z7$qrWCKFSfYE-5o)hSJZ%2HUEW~r=+1$?E7U1%V~xMbz5YAK6Y$r@I%enrkV{K1^a z+Lf-tC9P@26P)u5XSi&2EnGdzTHK;mxYpoJSgnEoR{vDPxxRHSgrX~5+icgn9IAzM z)eBzs(pN<*da8N(>rmEOL`VN1u!B*85}qiYIZTQ&b3ja`=kOTCHpVkg#1s@Wy8K*9c{XLX9mCW@~ zuY1)i;VcKb&Lvi{i{+f;Hb;+om`<|vfL&!ROFPWwPP6DJhd6r2yWk0Lc*8p$@{|WC zh6u_b(_^h4EaF=0T`#sFA&D5gcUzN?4}9eRLtk%a^1k%NPq@R)pHhmeKcrmcC{f9Z zRTwiutQ7EriAfAu5?I}{aFBs?kqcMi(%rl0r7qsBAO$seUi7B-yb4r|2SNB==#r3x zk}07PPG}jOtgtiWb0G{*GsDz0p$Rp74Gw1`;2rXCNj?N(5WTY<<{$?;syrfeymXxi zFR?ohe!&yJ)8IKu$Ugf)V;a+VAQNNpKWj|nh5#hSF@|VBDn28EQmn=Lpr?(4EDj;# z7~&~v$i;pn@gFrLqAMC1JrDM zB!RP&#dFW(< zYEp@oW}~YqDlM1_(%F31HudFAdgdxwx*AqFjU}vhs?%7T&L=%h-7I_R6I%T2RvZ3F zP=E&1pyV>Bs|eaJMWI1m3`N5h(C{vOMKoXf;^wL>8f-O?^_?1LATh0k zIr7nuexM9x4@;TGTKX}Z+7xIa18PurDl&pjLX%o8=qU9@Jd+1 z4lb~NB{^V0zE{2pjg9psr7x-SpyIt{+xo>3j%R>IX z(7ymyjerU48rle0^9W9GZ*Jhj;JA@E;L$LJD~!Y#M0f@oc4C)2>|qc~k&1SN&xdY& zdn705#V{^Fj6Fo-8uzjGGcIF}Bh+Lk9|w*y60wkxTznYuXN|%qGK-h&#s`0xLM_Tr zdNM$qM#4Y`SFRC`D4?VN-XwUFVpe|=MB#q+kJ&eojB*C9gl7CdU;+5QK$Wgk$~QX> z7+57bbEP|zC0eSbJ?k?+)01A31V9m#K==bfLli|ZCPd4?O6e3&L9|P0CP(8GQaP1L zqcl|6mx@w@ZW@<)Vl__dv|c%96(hHwampc9CpBf8~5 zx};k=h@eKMYr3b~2r-x~sk1GQpgOC|Epgl}-YOp|@U8VpN1qtGvg?WYIXk3)$E1h~ z>44&usgidF7E2Cy#qYLJ4l2~NC~2#g1igFn67=yM~Sqr`vSYi z<1dyF1Ie2_%5#FvyF6FeJdxzQ+_(WHATtINz2q|v)*HangN`e^Fy@F!)@!}j1CQ8~ z5JYM*+5-{)5FtL?yFCSwk1+B*qlCWTiw~eg%Kc~&ooV z49JoW;1U6h4puV2HNi7lx+PlRGseuN2J9t6_>(^wG(#b#MA5)z!pzLn%w-BeNW&&< zGQoSXLKR%WZ;F;wbEjL`w0hDsVX;AFsljczK~&4Z9L$zdlP791LRdpWSAmsoIzr!E zmsioXT}wh%;k8rwO*Y_~jG~tmY{D||8jec1XDgU!6DjSS1ae@9Hgtz{&^C5phi!Y9 zj+v?dZ<{GPtV26YM1Av_O@L3FDVmp|PnyvLoQbNS`I)C8w?i~H_k5~G98iFh138$3 zMgT)eT+m4*7z%_qLb-!Y%mYA>I6g3hJpsi~97PVrxMzTdQrx&x#4A*MMa4PMk!wX) z^cxm6QO23Y!BV+goKYIxoYmkZ$kW;rHNDeYch0Ieu-P6A~41VOt>ta(u#SHgxA1ctTj1-MJ@UIx^$N(EjNF7Q4 zC79Gn<&BeEFwlES2YaHLtgr!eNf^M6nzYHAguS|qvLL&UCh1Av3rYnDBNOY%S1n4T z{5_w7B>boVarL|#5Hrt{%g*z>9~uu2&;Sg;0KB}v2e<(HyAlYY*ERwV z8hMTae5F`Iz{FI{#%w@d@}&r*Ov}7X&g9HZ@xW+uv{9iH(KJCT#KP0u!PW%AY2lV* z`2$jmO>D_c9h4S~wM}_q7Tip=jir`?iZx=xLU8F#Nk5uSpl_ z^cw4gHld{iPKYT_&`wWq2W;zyd~m~zA%}@sDmmns^<>XG3{X6TnW!2>t%XmK(KkfQ zw~+xV_oM?&AW*bbnmNdts%Zp4Fc^wcn@N;FJlI6Lz0hCEP`Bw&zU|w&3Q@Z9IFEBt z#!*qjl|{nco5GdR8f{#8kO$0xT+V@9$imT?)6pH>EYC7V&Nas02?x*}t!U_k(o%%v zF$9A^x+P7zCY>IPu!z{o9y6%Y+WN+Cyi$}%iQM9?-|Ag1ILGu!$MzZ1c5I6KK~uD& zM|)ILL2ZlydQ%XBJF#dB>Iz6ZtyA)H$cEGl?&VYO{oeIbi|Xy5_7b4~=7kLV0*bCf zRF43Ijf5dbebh*eR7$O1w7dbd1U=x85FonAmV6GEoPm9X$rqRb>);O8Q$EsjBCmwK zLXt{kO;%Yo$^&?h3VtyQ4iGSURaZTLTD4Uy`c>=W$qm7y0wF#V(XlEcByTO&4y!+^ z{3Gjg)(GLgWIeGFP7xXDk_aQeYb_)*<31_sR^*r?3s_YJXiIS&S8{D)a)rw#Ue^lQ z5)IG*4|rEB_RG6;*79hgE92KOv9rU>vp10w1#C zOo3QafkJng*wGxeij9?xJ=uO5WEcF{*aVo_ELqev*&MW%9;_ArSs__zDX88=!iw#t zA&iw(85bwK*(GGCNEU<%oJ|YVD31ClNT390<0>%hgqR`+nW~tR$%m$O!*hUIK3ppG z3^!d4xAw$ZV8(>49mJ=SPhd{OugzMsRhqL+Tcwc$rkR7V!kRchj(VhQ6%^zfEVr4ct@ggO5wx!!_K*&8x;~+?IP>#gg2|-DiHr=X$W* z%f(#T(Ok~zT!RMPAYH~_DBXfUQfYh$CT(5mk3G~^C-}O@B z6)vOT3FJ*KH8oz9b}r>TUx|EP>!M!k6-cz;F73_U3Hm$#@ZD*i-k|aFQ}R_HK$WjJ z4I!yupY=u5(0E_?jbGH5UrDWBN<~Ym)?XcyBIJ8Luw-Cs{bB+3;nfS(1J(`&_Asvm z%MZg=Z0)fM*~ufbq7Nnz0rB7g2_w6nRWQ0>+>7h#i#|SLkTF6^Hu}CG>S{-7U{sA^ z7}?e!u8B-w<4cAW9aJ?R%qMsP!cq(GaB9K-9aLmSW)?x%7D#4;i}j~UF3wAy z7J#A`PWEJ7v)NZ^gF$$NLAaJnVB4R2;=&Z;>$P-zA$tLYj?zUG0D1VzYDZ_e93 z+1qlK26L9HY3Oku@9}DwhIIDZb&easooB;|XI4aV!CKtHvFFXv=Y6h+ewN(J!RIR9 zXMpBKfxbD-GU(3gT!aSQU?_8jhQ^1sMv0D6D20gFo!!~p#_fsoZp3Jmz`F5y39R$z zl$Z(gK}V4W-uPihGBxRwR=c%h>8W5YtYGQ?=8eecjcJ(%>N!n|fxKRuwsbu0-k$Ds zPZx|yr_-~bF2@jRqc#dIID(|st&i{mrsl}_h3d_d>Zzvc-_TzR$bb+SV)A%kv(~W7 z)(#pOYXmM;V-KP?8V|Sj55SIVxh_f%rt4?7Yiifv6sy$`<`5AcVG{nL-z$&=_*FI< zBx+@%CkwG|pWz+T)FAG@60@So<}o3%>>rMzAl_^p?ris{_687be-~}iKJCzZv(;Yh zDyHIthiy43q(*8a!YoXGCF9-hh2ADuUIK15p3LF4z~Yu;&HO+Q+)POM6y@%~IzE*> zzL)4;d6v%?>(+vixa3RI?syW}XhBW?MeY{cG;bU{&GS}Sad8${n-}1;D2yV5a4Gs% znR)5#O+#r z&wL|s5zpHDjC;D*H#!jJ6K5J0XYqt61^?&=1XV9S`y!Uwp>z@geWf zA~*8EMeHKzzT zfAcA|=&G~xJs+PuC&zO1bFT9`b_CwABlMAWN2Z`hv@0$~S6<`gAD4DJhy=*-g~*w9 zAo8l|@A|vz2d_`>e(w*AhcrC@5i)fWN(v-6ed}X3PsTl&`10ecsb8NB{`_t7^Y7ng|9<`j*dKuf8py_g z2lA&zfeb2`pM4QZs0JEp#HR%rCY*7?+2)yY+IgoYbm&P(o_q3{=AUo+IVhoY z#BnI1i7v9}qKr8I`Y3RTB%%nV!93&3Gns1oj5N?dBMqq4h&t-1(^NAJs-mL0Dyyh^ z`YNok%IfK+wc2{CrnBg(YahM(`YW)({>ld*eGq#rvdJpDtg^y7`z*A^5-TmS^;mnY zweo0-tvuIi`)#(}*7Gg7<(f+_Jmsbf54-KU`!2lhsxvRW_0Ee9zWJgf4!`~SD^558 z2OLZ|!BBdzqzNYi2*V9G><1ta2NJO#6mk^LPx=c(Mc=4G}A^O@pKeVOD(k# zQ(JvR)mUf$eRb7c8}T*RVT(OB*=3K-!q+UI4K~_ptDUynam($t5pU0Zx7sVPu!7!u z_no)jd<)KZ-h&%{IO2&bzBuEJJN`K2kxM@L;%@)_H{NW^4L99pZ+!$3p^FZN7hWuJ zI_gU>vAXK3yZ-v>PRKqx?X^46L=#Hrt~>6#`@Xvl!3(b$@fHjOm|q8>RMJBpK?IgY z&Py*5^VM6weDVgp1(#e3T!laZHia*K0YTYxfcQxXWmNY_DJ7RyO-0obTJ;YGlUxbt z@4Za=J5@hHmdCud1coY9k)KrR*O!K{MKA|!pG=-YKea56G^K$aUmExq?E!`*6TqMM zz;~Gc!z8AJjCqV^T2j2r+@N@qaY;c!Bg4*w#DW&g3u;ue8rHN1Hn5=$ZFD0VLmeqrr;5_S4i>r79qoW;3+DOa6{>Ka^{gihRdCsSLAM){saTA!kO9(h-j) z5u{1%Xc9&`2RXu2q$Y8)lbn1KD6u5UD{ZNinP`$b%t4MRjfqTiQq!916sJwh5>K|g zrJxE$s6OekmwP%CqZsu_NFfn8Mm$(Bf^nNyfvTCLdL}fX*{W$yV^-Fb6|S;*t64n% zV^_0?7C48+tZ|YvS>ZgVv!&PvytKqXH?i3 z(1K>PqBX6hE_GVeqBgb9U9F~H;~LeT7B;PUuBSfr+}qApH@wA-b3~OJ;Rxq9!0oN6 zi3?oiC@0maQnjj9z3Nj3XSu!&^{8|!YT2$Py0NAXb+9`tT5YFR+WoGrZ57_|TsVTs zq@^ovA&5b&*F5QEWO~!nD`3TflE8FedxUWxPR5s%5i&M>hxwjRWO4uq%H@6k3Wy(F zpi)-{9xyKbQ^5Xg;y($dWi2HkU_t5>xtPW7Jm))Ezyfx}(?>Cmk&I;YXc{L( z#|1OE!E_v?eIPW*J@(N&5Mm>QC4?du!3ahiKEr?7;K)Z#qQsJ%1Sf(-iB7nqANc^2 zC!YigDA5>{Ps&m$vt*?$WunKQ2*r;)!HF^TxJ+t#6D(zUCtBjN$+z_XC6uE~hek9a zn2#)GF^#BYN!;dA&Wt9Q!~9HYvg(>Mwy6%wPsp1VRTfh>0!qVG+Ib#Wv;#ic&PAp8oVk zKPu{uk~C*jI5o{qtuvpc6lg3x+Dn^ugjm}&Ychpet!t{&nf|obz80$3?6$U}rmd@9 zjoamrjcma|^{LIqDzu|5?P*7QtH;hYN27*3A>w=&JCBRD!c7X1s>%hCI=>ZRW=tCgNW)?!sRC;^!8zc^A zM(=fEe4!{`{7UD({Ebc*!;_r=e+LU#s4y4}eBd*7bdMO0u!Hli_d0?Ik9oYieE>hA z_@oH#<{<-!GMvX3ts%t732_|S5Qj!V(!`bza*)sQ;#9`i#-6`1DND&EDv7C;JkA6s zQvZn}_ZXH)u9K3R%w#7A%1(OXrId4Dw?d1%0 zIOCtHZX!d8ljbD*u^*$rajcgXxc<^8p)8%r=843Y1F7aph%4r7n~XeR$$Gj zTB{+=tL4nlyjrY%VAANC2vQAA@stUQ4GI1l*zlCEtxd5B+uRr%3=)+LTF$X)6|*T0 zR6QHD^`H;_;16zM(&>g_{#H!MNGZ>X_SGF!04B~H&DEUECD&vr zfFX_|R9wIX2wiAcm(d-aMWBWiqMOt00Mvn3c*Vwe2~pN*Sus5d6T#PVG{@MLo!R9V z7j2P$9i!U;*nhd5;b}n_$=%%1UEPI&8i`07?Hx8Y$b&#w;whdt5?h68u4v!(y&3uW3bLG^_%+K;qEoT(B(kiZQO*;);M4mpC85RN zyf_0?LZ!asAHOhKqd6MFD9rys%m8+!#oWOGB49-=prH#@;I(;`QeBP?9u5xz zA!SykWm47M=ndw?APPQB5-Q;mw$2kefw)B>xv>rvzGCoD#9R@NN&t|@c^n1V8%TTv zy?vo>*=F-R#L6**SghQ;G2#Xh#K>9y#Z4%dVJsH;u%W=Ip-&u~QzTsc%#Rj+T*mp< zRKyP;j+XqegvVu1_N-O}xx^*9oL!Wm_V6M1K+pno=OE6eN@$QFW+Eom=L9SOe%8ct z8pbCcR{_X`Au`2f!H<2OA}W3c2*f}PWEW`!PZh$V4nbWH=m9O(;w}1uZ)9kC@y6Bx zhog916Fm_y0%O^c-FEbs79HbtFk>>d=-V+Pd0c^cKqEA^hcv>>d&q|w$OnFqff*>s zkM>89vH{5C$B^dT9UaIZNm$_hU5H>9eXtQY_7R0qX*otnhh=Hw{fCFxNH8r*BRs-A z_9H)bf|-)Tk;K@KK#7xpQYVG~5{?bzCP2xTgvpMP$?0XnLM~+M#ZsHF$)85#M9RtS z4a$>UBt}ji?@^gYex&ei%9lA`OHL}KR_dgR8JV>TO=6QxZVFC%Q&9HG`1#~d(pjj6 z(@=t+sPe&4w(7SqC9LL?Q_^2lLM1cYDl<@}{_P)D9+bii!d7ynS9YbxSQG+|%mQAN zMyOj{UDYIH5R}zXB$2z9V*;(Mn!3{MQk}-SzuNmI>lMY zrd<_QSv(MCWg^NFRtMQn$Fe8Po<+l+=L-d>eQqLt&RhZ<=Lq$u03_$aMa3nO+))&$ zfu^E@N-VBD2zIzj5;HMX@P-B0gc}11Mbm|`e?@xh{xbZkTxzwWn&z9B;GqZ~`i&(kdPQr0De+o*G%89$A_|BrX-|pX|v*`iU*|(i~K;^Z+FNIL+^!sT2CS>QTn(`@I7I z12Db7!>rC(+E>grYYs;~ZPr41`YX&T0u!KR6&vXbSpl0maND_W{$7l46Uwq>+Z zt6aL;&)LzaS)^w}YY|X6&rq}FLx!y3@v<>G3TTy-0y4v8f%`4=<>%A7S z5g#$;Xq95FAQC3w5{BErMzIt!p%N7A@4Vs#@m9ML*2R*9Zb__PZnzEyymG$Uc@ElB{J(Cjwy>&kZ6Wq9?zZtQ|6(#`WQV4suLHZEb0m&fXQx zt`=cPtpc>CSpY3z4ed)XvQyaS(c-86xbb1woWNZc&dv`evgZO6=z$Vl32=l+WUUh5 zPVeXrEPn0RhAl0-hS{EN+8Tl`ukE8O!q9(Vy zhUq-k^CJLnKe9tR>~oU%qdtDpKk_b?xapAeuJ117k6{w+veKQN9-ksF^U9L)(q1n` zFZAaB37q&+q9}?m4HGdL)1!W`@kuKBmNfcGs`|=grn>K|z;C8}s+-|2QQEJm(r>5^ zWt`P7|E^zB`tP6xumI2MQ`V|8;3}?CLM6haJun1Euo-BY1y@u8Vlc{ZFa)aQ z%XGm9yCteoYh21@U2>pZQs4wm;0k{r)XcEZaBJ1faITRn4dZaH9p+))R8ReIyAok$ z5-}40HDCv}zH(;2I&l-8l@up-?M&g;G93(zz+*o)dM0vLFi>EDF>XpM8LI38VNV+G zR>o$}B0KULj_e!m#P~4h$L0k8EJY+A&?r_Xe1=@RWv3ti>;$F7Y&r5#;16y?1zAY{ z1^w_GX1Vss!cYhN-29N-RyZ;Pl=6LM@&ar!CpT@=GS*K(H&hhu!9n*W8Yl*MhIJ|E zNU*Xizw*+_vV_)hEfYf776N=1f-dhemi6*`0keDwb1=s(+4+~-;cYS}b9p=?G)J@G zqQ`+Fcr;Ui6p%1hQ=>a4?lw=gH!m*avVntK<2Xx*I~Nieq{xM6?&fZ8d4TTSm4Q27 zF5)qW>2fKU((^n*f{a4~C8VAwaFRRZgO0aDKYLO@gWf0!3i4bn>NisgM~NVbM zCST)VQr&tE3bwBAI##_6-=Ml@a@)Tmwqh6i?3A1Ds3r`oCQ7g-Y9Y@eUN&!fp%_O5 zXm|F-g`pYu=EVi~a3PjsvEjd+&jGygRg~Oolj0o)P<#^N&bF){8_@O$^1=0Xy2FsV z_n}kF9Dc?-R4DggPykT4_8`xNbZato@26@f0DcxNCU-X`n&K&X00(scMuMs`NGy9R zpEoR{n|jZp6R@{y=mE*cw|pCdaAf%-F$!`hl77FubBJ9PfrozwxXoWd-;$AmFL;Az zy3e1Qv&IK}%!i|Ev*TL0l7=&e-%*A$h=g?GhO0O_pK~F75s8<$<)V1#Ha#052;?a$ z>T=|c$as&W9+j|Zl-ziZ^LUcrZa@Y(mJC^uk%^wp{ht2rCx8OxrQVR0lATQSE1iif zRdg;Ps^Qatm3uTJWZCd>d8i;?rLIFut^?&$ewd5-OG2NisPr_Qd77)a{K_==#rgR4 z=iO@Vo3e>;rJ0(;q+8Dy`OPpx^4C`%9toUsh`WB||NG#z-*7I69|c zaLOli!z%gz*9v1$qrYfAPaiuT0;#0U}t2^KU+;swGN3tzxs_z>d4 zfg>nZ>`)OS#)AS0Y9x`dL&yviNK#;+;G_Zt2v`pe4u3Hz>wR<-~0-Z1gz+{=X?gYUTE({)AcP?GQ7Z_jv*znkc2M{GZ9JHWANfXVR zl_=4H*>jK2Jw$iz;RJPRCVTeiaqT)!9ze4L)egi6ckV@h+MFpp3V$(Zr~AHV?3V1qyb2|N%%Hq=N^K{Xa^(7^~LoRGo_9n|l_{m|HuLo~?fP>T>n z6wyNwF~rcpGRRP|j5E$?1I9DhXycC>|5yaaMH<=hkscp`gcC|A;lvYALOJrtbCf*i zNKZmJha7X3R1(Q5Ke_VCO*Y9SlTVQ31WYc)9COV7Ew#iF%rrC6lFdytc@xezF_}{n zOyHc8PB`hPla4<9{1ebX1r5{@LLE8Ok=zu;Es{nZjYJYj5Q+4eN}-WPnrbw?hSN?v zT?f=qMIH6ibv!*4)l^f}l+{*Uou-;;WSx~(Xl%U|*IaL{l-FK;t#p=Pg&lU5K8!sU z*<_VnmXBtgeHPkioi(=EWv#sy+ianghudzw{TAGCxrK+^a?L%L+;`G_huwDBUDw@s z-*HAAXY8%l-hB1lmzjS36=#@$hXFX4f(;Hvk%SdVgyDu0nGIq;B%YY!iY>m_4*~tl zSmOZ2_!#7n%?SBp`%FF=<@&nl!agwMgYP{5Fx;D&=JTSsISTV~#+hd-c>ei_n}g;# z=p&3i8tJ5!M%oA?j%eEHrk|eL=%}H-8tbgJ-kR&KS=jn(7Q`MK>aoo}8|}2sUSS0m z*k)Vox7~hQ?z!o{8}GdJ-ka~f{r(&9zy%+i@WSyH+v%f`Se)@C9Cw_F$RkgU^2$?d zf^y6)-<)$LnCJ}j&qN>nGZ;))YJ{Ygx=1664tkxSh-8<2BBfMM9rcbl(%tosED{MS zskmwhC%<&sNhRWoZ>grasw&E6Z<|fwYm>#Et9rCAE>&3 zQc0+{;*tw|_0>nKuDtZB38%jju*LtcV&OV5+|CTYLmnI6 zObS0s&klLG!zaHAtP@(2=f1QL-zVI(9?sY-XGQYf5+BrIX6O*(zAk3YgQ-)i8Gj4NLtBnX`BXv51u| zXC|v!(vqgMo>@(6D(hL|(&jeD1rK?k>s;@W*Eq@Pu6>;oo%!L_sFbf?zx%GdPY&4`OIfO z(*uobch!YmrxJQ)DI*%j@c;EX(8$YU?WdZinOI`?z0Kf#s zFpMFLU>2|y0oqR`uq8}m7<0hLM5ZDkVBlpi!x;%;MynQlpyin0nhkO=4->-!2-`S9 z-~0xJ*%giomjj*VWZ{J{jG+~#0EO~G0lnlI&qg)cL-(c!JyB2(5QUh~{NU$^_t8&) z_PfLc`G-LhYT|;ZSVjJ1=tN|kP!^5Ip$~bniw+Lsfm}oe7tzQ@ySY(~0^uVMdw7nV zuwy7d;fX2XF^?(#J`x}Usij160!ri{#~~r9$VjrOOl#Vboiv#zJNZcyeZrF_Er|(E z2KkdoHqzvNl!!IbDxpE z*c~V>u{!`1Kp)Gr7)B=0kl7d1p`H)SA{x<&u4iYcz9@THtlRG3Bm|rNG0jXK%Ai>}7j`S&v(GvyA;pTGFx=mcUQ6 zqm2t@)lxsz-tT^{eeDAJ$J@i`_2qd{0RLjkm=65*BOwVv1Bw0_%_JcSEXF`kS-oFoTEj!2)o)nVR4efoGg4dyw%xG49|;RvqQm#Ib`+GZuVXtW^}$g45Fy- zd(isq=bs1~5ECJEpa)42iU?+K6tPI5!E2F25Ef$?xu_pD{DJB&qB@RhgrnR{0`r-l z1SER@Bu6lPqQrPS@rkYU$1HuK#cfg~C!S;ubC9DGh_vyI6*=TQ$;rrrq7$A9rDWd& zDwJ_-vK$|A$|yt1l~>NPmQe+&Yj_#@(Ki*C!z|`rlDSrACgz&i+-5iTp;>=A5a? z2RVx${o3M#p5^flJ(H{bf|mdM=T&I?9~#k#UbH+H#xO%X8lUn>(j={)D(2EKti*O!XSu(sMKmEXKcpQTFnD_hSp|nX{crdV{K}n=GAmf1+yll zR&b?Q3UP$(rDSkzZpsFS&Dfkx2X~MMdr)tn4cep)36e^wCWmvrt=p22+nSCEm8;zU zNGIK1K;0^CciQcB9>O6^ry*u1A*7J5R_CphBHwU_3NKD1{>|i+N8of~E&^__jA!Ax zqTw74dpdvu>`>w+j^YI3vB0n?Bnz*$=i|a>5E#qKo?C&>w=>=xQjWoAndARyv*zD&hCajknP^9?cA=1sK8}H?V#*VzsvxO_U^y_ zgNe)_LI~tRAY_UTPaGRh!T5vmP6R|0kHOd=5Nw1Iim$rf(MNgXKY zVf03?^s)rUbS#i&k4p#%_B!DnWp7L{ArtVVA$d#_++@fO<&tvGlWfl-e=o^)q!EUX z^L)hk9wkzeFU>BcRb)x}QWE;8kNT{Sm#`0*v~QTWuUEW}nZPgosD)a{4_b24C$VMy zxW)b4FaFx4{e;q8y2+c=1<>fvDdoi(*v0+`4gdNj(E9kpgL^Gr$9ockvNkwrcAUF>&W;uIC=^3@HE=Q86_q=z&ZV7Mp8>DD4hvu@*Bd4&tB< z%3v3Jal5#VyTB{Fv?DvFpzMwj3ZCEz^l~qih8dmFz1|Yk@GHLt4;wqCK)ey~6by>S zaqvQ9@dyt_xd_5!)QY;%4+3EjYJ(9l4WOecSmQH`ZrjPfZXRZ_`mDyOn4 z+vzH^ve6RZ{|X@hzf#itqo2ldWd4Z(Kdmj>l0+NI0-;eZ<&rKXN}@cp)%X%;2-DUQ zM^|w*YM6#Ge^u95s%&EF1!pQUYsxa=#@LcgGn>^}pA~R8Q`(4d2_(mm?&1Mf7Cr|<4@u&GQj4|pN9F`b6Bk22ucAM9HZ=n@f;t1-o^FHc zfYK1uMi!Jobul=25ki4cIleALsAIgY;5sr?LpiiV*^BM`5=7HOzC`rB>dU^cNWb{Q z8nv-N3`Flip6OkB)NTue+D@=7ara>3LQhKvp{A#>}5$v(Gp|2Y?wCK62nMNO?PM{?sf z7$Fc;iIpZrPHzQPHYHU|1y65xCG`|l_;k$tRG0vDR|Hj=3f23JCHxqb{B{zX8nsc8 zl3j{&QlmFgE49!r)hgX-|2EYSJk={fm7mN&EJ?LvPBj8cCRHbJpak) zGh{`!usW+M+5$YIr{(P80TzH|TUHM$riI&S#mf z31ZO>>VRm?;KKf3L1APUAG8;hqwAJK3$_3Ywm=xCV}`Ed3NTbdHlYyj0nIEL~T)-MoIZZ_T#?pqm;8KM8e>1aWqEFvGMi;iV{SP27z#o z)DtSPb@N43wmnI3- zCJ!}On0F`XtXdWop?y+%9~z>mmnttcQ#DndwwHTn!+QzP3^+!7$x_qE*8!>Vd_%1Q z<)eL58rA9&e&=`X>h~{4$^?CtlMT~;wT6EISf{b31RPIh4#)?&+tEFLy_`YK-s`#CS7-A3Rk z0?~#&_G7a+;k@&VznD6oVlC>Tj8}Hz{{#XDaA0RcyMfjx6Yl~)6^n}b(~kWUk0I!| zKxaVv_>TekMPP)G3t4HGHidkVyFx@c9vKT}NDC%;k}ElrITQ$%+iAGArn~l&L0ObR z%|EWOy3LkBun|E7kCn;xWW0Ov?n7?jR*Z~@iD<;0YGV>QK@p zkM^jJ2#LfVY4t!46cp0N95<1^lyn0nBR4m5dyL0+&vQAK$V!(E(m6*U??$G}Hk!o{ zFuV^CVZ&qhR$OJv@R`fvAs+5|pZBz%HRYFJGN5rqP=SSbi}#?BH(DCn#-T~hAX>-i z&tB?JqR+{CF;)K#MxLq+qceJ=|NUSVEzQynaC`xZd`YID*s`SUqYB*eJ)lvg?UJG} zDla|MRyRtfpZk6Ta|H3%e-D$^c3RCD(=iA5*M1tPfla6>GpX+!&jSa7o4N?K4cw#} z&@uR_ny#v!@T#q+tw1;;x>`2Tid^e0to$%z$68zyVkyY_u3xw~>D8@87O~~}c>0y$ zzH>Jx&a=KEEF`O}U6Ue^c(Y1Yd)7x^2QG)@@M4`pBi`*He5cgCCx$;(i?`T|_ZqA& zLby^#10?G!RyG65m;y%N+_s7bracF2zy?ZtB~li(CqS{r0w{=%BpRp!#C_a}Yjkel z23+xHmF_c?z;S5%051%;|8-kwnbtU#!?&9Q3%UrBX$V8D7QHfgxtSXX%>21aaB-sh z0_pDX{=<~{EX~)&DKm!Q$Mxf?{%Bx&H zEIy$gDlTD_E;n!k|7oVB^-_LoT37FvR}mAZ*&Ou+cvx5Jr{#Rk4LHwZU-o}+srj7R zn1BgKa}}U!6?#9adf)f6)ihC)6~VRQCgLDWc-PextVfu3x_W^?0(a_=`rEa2Kmy_z zajp5a)887dL7m`i9fD1rr1OIj0tQ}_tvaIAy?uMc^VY*t`%R99{nb040r*`9HB!; zla(x4x?0KOh7AiA5+X=&GeLp{JbPX&2(%(anieWDpjjbl1q&%}=(qtDs*<* zurSQxh~mYJ8#{iCgp1_Kl(~Spd^wEf&73=HCIdRO=+IwBn_+`Gb!szeP^%eDW^-)M zRcddx-Fft9GF7yYnJd~iY|(07n>mC044yyCnF|s$=+UD=gC=$A|b!J;9Eyy#1eF#@fbX{D4hgK4Ik4#R1u!vq5=sEUk=NFk=03P`Ge_`zzcuCjUutgpg) z$5*!AifgX7ieZKry!r}ku)>PrS+T|*i>ziz)Gyj96tDZvC2Ew$uI%PzOP zO3X6POmoaI%lz`nELk-bRzCl%0}LE-L_*OW6S++YYV0wnB2xy%61Vr;WEoK<&+UP)7Z26yJJZ z6jIhiCk;d5iX-jOK!O7fI0b_P6;cQSnIyST2q^@&L!(T!W7!ZHXP(l6*gELGLUeFWMBhwzH%bw1mZb7gw7;5F^NfdVu+p~$2iJij`N78 zJmWD(KJsB6^t@+2`iV~_J`oE25a>Tu+~R*iagI>X$3F-vBt!%}sYwAi@?(0>re)Y{^ z1?z(3EN8Kz6^3l7bDhxI*0sn5&v=dtUEgZgyVw=4brohY35-|2{t3{43bbAUyH`O8 zwy=aMbfN!R0Si0^(TGZPq7<#@#zY3Pks-lkCqtReR`N2J)oi3BrJ2h<%CnvU&1Z@m z+t_r6w5G{arcbLW>yj2Vn37FwWy>1aL=v{Ham1%V-J9mr2DjO@|E+Uz1Q! zs<2qW(ZUNsqZ-tlK{d&#Z*xu*2zNOI z@-s#*it!Wp@uG$O!-*_fF%z4((1F-^APb=}L39Lh98WCA60flljVRHGn1iA~2Eq_D zei4imxyT$N0~ySi29JHrBWnnG$ktGYk&S!}BX4raOnMR~oy6o#dUDF36s49(*`-rz znM|oF>f58Etsp@D_XuZWXaVenO>8SULj8>?CAbk=5|MJ;w_Yg^vZ7N@%_@N#J!YscP$<3OsBNf%~ab?OPaT1dRU{8t*1fd8c@w0RIHV|1A>bxVA-Zr z+6A_D5qaw8qKegnOtq?y`&+&tH#o2H)TAUwHKXL9vJvg!&L;DD?^| zvFcGA$2qRp#V|(EAPMOr8_UR3oLVH0nelsOR0C5)E`E`ZtmG&w|B{!q>p! z%2>iOmu|G>EqB?=U}oi=URmbwi+}unVsoRq;b!!se^Kk#CHkH5<~YZhn3$roFz%0k zPT|?cFKVW${QPIpG);zvE4;ERineIt^i7(L>`!pudKj{L5<(#df{?Hmd$Y#~8_5WP1PIM^NW14L%)lx1H%!i8e8z`-EBSma`DD)5 zlAI)cokV?EVtv>5CE0gMUDkbWA}4P`enBaeV`hGiqJCJL!*_HnHOaRy_gEmbANPvk(fC(s0odIbN=$6MKfnkto(NcjF zC@vQGEqJMc^>l)cL4qq-|1XZwf-DG_gK3!iQiF*JFgwVYjp>*k(}UGjGQ{>#ASHw~ zV{?&3gfi1?N0@{u;fQqzQ`x3Eq$!2r7H-zoa$|*sS?D@l*oAwuRYg@0>^6p*Q*wj| zZ?l7j^rnVu$cB@{Z;&%raY$ESLpqmug#sZEeY0<}X*n;YQ|h)=kr-GQhlrwCg{0|- zjYAM(zEdr1;uDwQ;>{&p^P5*1V&Im&2@Gz-~uf` zUDQaTBnm-qw_Oz^|7oY8LEzYpu|Wp7G92hNjwlocE3_M+k)s*Z9D%Tr>-YzY@CO?y z2!P~x)o~r2Kn~qO4gf}Zmp2~XF+`cCd6DM{|A?je0Uw`0dR|0fa8w`&vPBIkk!^$_ zCsw9nI(m@6rjYOm92rO|!Xkwbk~0DfC0Ui3VhzlYk}0{8f0}$TseG6us7W%DR92H) za+6u6lUjBrJ?WEi0w;1Zl$C0!c)}t@d45UBsh#R(hq8X2`jnP3mCcZ+!oUn!iGN$^ zm50zwg%FmrLQP{ymS%aDw~ByjIV_vemT&2+6L_Q3LM?Mym(}7+L)0^GA3gcm3cfOHB#@1b41vg z&i0v5sGOyj*Y{6Ed3lz85s9l?}job)dFIqz2 z^N+2gjMrwMxu~()NX(6yDVjAKI_0gua+op@#ku=5!x;G=8lBbv= zDSaxufJ(f`SE!ogWXEf$hZ;$Vx+9BVf2vYR<|})4DGAbT0Q&nAfVoFKAFR2!o1gYvd}zBaDM@t9Czl z|2{!@Gc@C_lcfr(pls+Puk$(rc(|S1iLd$EG*-y3R5)$`8?e9Qh6OvEM@5EZ*qadh zoA{=0kyEjI=x@eZn*%qURnwXkYgQDnR##&+tf>)#7>VI&JBXMy(|I*4`@;%Ha&l8| zn>AO2L&g01G&&n|tiztgG>TILS-YU% z=(V{8pSIu7PA4#P~$#Oxi{F+`Skd7O)-=>fU{0$~y6|3wLD zx^a}c7P-1$+F`CMkr>IQ5puh}oXe2_r!-b$H>OB&<#z#?J zPk|Yj8N9)S8Pu_cP#z4zw?@KAt<(?&%96=ZOh6Ttxx$#~t}pz;tpLL{BMPEe6`q-d zOX#vVmBXdUZ9d$?HvADi^@W)86IfiafCHR%lf;5mh)cYN4EMwqE5)@r|28n-ZD*`C z1Dn@r#XEpq*nz!@NY%y|_l1UIG+azHN7J!eQxIz$v2EDcObAn&{j%F>Jf8@kL`$@x zIEqDq06+Htsjb?99Gio@Hu_n}v7K}UO54qo5;eRuAVUL^(FLL5wUbQAW2--3hsmWT z7-~Bh2!t38)dCFzGR_Ukp)AVRm|b81cc%Q7HKfX`tfRk*8{bu4s4-rE#~js>%elO` zj}Sydbj+PF4(tHmRcnozP3!ln$-r4h_+fGSO0b zz7|bq?yIUBZRM@%sviB(ts-cCpiP2ytKIY~2B?54&466nXt~kS4_F0pS!vBe(=~0Z z?Ud7X?w5Z#!9D%cQ2?zN446PY)PatevUb$C2Clib)QPU>6l1O%g{~-*!a6h6GecRb zzzVIv3RbP@nl3Y{APS!@3d?hgUJY%lBiY+I$EI^Sd)0_Em72;)Q<9A}lkGLIIoMfT zRmM42up`&@=Ic;}Ho+d8!a3M)h}SDCnpfjExIWke$DD@E|AmPyiMDf`c9n;Jc*aDf z#=L$vw_~%KEpA+FQ{m~TwKrvW6-sc>|1Z41;Sli#I20St+ooa0wFW;5EI?gINfV^qNJRSk;c;B zrMDp8-FatDh}NrNP#WRQ27j>fKx*E(e5FA|3I4_2l^YJ?zz*%u4(NamI^PcLfb;Ay z%m9|9|5!!;2;dm0%>j;(pjY75e34F%k=^{d{s9RR&Zf8<35Kxs=bT8LA`QbJd?8Lu zCT`-uG`udZ_G>@mOeW)kTH`i8O3%yBIpWW#WW7HQ|0iKKi3d7dwM4(J25`-1Ljg}zXSZi9@9Cf(>Q2WqI`C}KraI-RI|i3m_?kL1rJOaqh*XotYVB6cUhKJU6bo=w z_=Xctr4w=!|Gu6#!;Z04rT)e~Rkzbs06}8Jz<~lg3_Lg@0|kZ+DKLQOP$I(&2}g9m zNKm834jC3QWS~F+0t5w2nk1A)A9+bY&p`?kcR#jhJ#hSHhD^W>qR8Wv$!Po^4%$|L4LBm=N9&eUBd6K|f zx^)dysBlBCUc417{3Yn&MT!CF z$!H*@S)4|FdIjngtzEAu+@f`C+J%wa#+_StZZ2TJZ~@-?cW~ig!W>7QT={V_WRN#^ z-aHI+>dv1_pN@TbcIes7d{`8@To_53uCq7OVWRR0g9?Yac{|G0H(7{bE#4tk)AJlM@Og!A=6A?!QvBMBY z`~<@kH-W^%Odx^eMHnHOWRgg3j6@P0b@Zi2X@HStm|>VTr%EfY#4<}Qx6E=KFTVscOfknKGt79-jAxxQ%Ve|6Yu%rcgrIcAw>rg=3MY*y_xop&eXcFH zC6-=738$H8B5J9ncBSf7uEzT6s#Ia6Yp+>RC2X4?9xAD)05_bdixP^-BgfsM2=a+0ryQi7F27tQ1`W_VXCMm z$sY=7B)CvYiT0KnugM{qaEIL{h;UMVC(V5-KBKx7@5phQn#x-#rJ|Z@tE|?)s;aJT zumB>m&^qe^wKQm|t%WvU{v-qbuS)>?vX{R6g#s{nfeB2If)u#G1&QfG7_VXIga$OEF^$Y#!vfjptTwQzjcsabRd1dof2l$%#%5siPe2 zbVpw5B9D3Q&@D5tp@?ii;(6F32qrdB5QBi?6W>!GD&8kQ>|lpDwAhY%)ZDly1tJR=%~ ze8!K4A&qI|iAdH+k~N$GC0|wYNmGiFI-tZQPIl6hZ31N|#k3|-mJ&>KLM5H@bd5dP zsgZmNR4f6NC|cIiP>yO;rF1!}QKib4zxsP@JsxXEcjA0GMn8Y$B(Tr7eV;KvX#!QA$m!)iC z9R+DfLCOLn|Io~&CxuySQhGF&w$!CBg=tKAMjPEQZD~)NT28CximYX=6=D0@*T^=u zv!P9GYkS+maf&NS?qK)2<5jM5E18|@ z5->W>~?nm-YGyLe_>qkLa-3Wg`lsG z6YTYJ5|@-{?k6#+tL*BU5#o*2a;F3B0#?$!>EUi7F>wmwt}2zPsgHeHS%p`?B0u`2 z#eNvTz*?H(fwnxPbIUtGZ~+*=x!k2M$2H&qF`_^Q66P>cP>g0Kh(YRZLAo0340Jy; z8q(D4|247MSqjC=Lh>SEhUcAOaA4Ta9m=aZ_qxsx$K{7WpvRosO3xFaxL^K0!oQQC zB7Hi6AN-V~KkfLU7r)pHVU*Fq;lK}k=99)YR@jbjgpeF5bRjxk7(#pmWQZ#vi9t%D zkcX5;ilwn9OiF2zl%!^_T1+KR*4V~1Hf4^%lqMaE5>D$#Wsu|4$~^VSm9h-fplrG1 zMB#FmPnOg%rR+;%>he;Uy7Hx_{7YqanVGSIW|+l1O-o+W%-GB(vY7P?Hh0sT&Uc8g|2q-S)TEvXFUZyoqiVD&;UgazP4jfMh^_3k8WtB3--`SL$sm= z|Enm*DE85hicDo1>$FHkJ!(>~45g<&HO^$ZYF4+})kaI2(wMe3sO2$0#s7FyBg&plLJauVW5Nbx%RbJ0b6Y2$AGfb_O=?xE&f0Ng8XHG zf50`s0sdzI;u63B4LB}dk{c7|GVm~nQOp&t>lh3UeKVf%plCn{gqZaVyx$dX|E$Zq zLiGNo>N8|-bn11(l2}S&x4o5r{#k-MBCH$Vwd2@+eL*k*hId&d1nE zoX_NqML+r~twSBA?{Vr??6q)mE)}pcmU4%!UDKLnj@~8%Q?Sb2%b}*1u~4oNDL|945P!u zqvH(if`TAeI;LyD6L1YtJfWx?uc^z8t5e1E3On@Up+e)je1VsE|EVW4*p@&Dgj*a0 zTr@lM5QImFBDZ^l_h^u~lRI+Y4*@|3bm)(I(1&+e24T>mX@oGsix2uRyu*7C6j{7( zoRAoKkQtFYN}#;Uiv|^2u|0W{7P|&(_y%`;N6^EhOL{SRoH5eF#~WL{edI?kalLSiNLGG%B%z$sk;pd|Fpmh)Ty1)z*YFEUh6;) z6gClTf)Qk!q&h*35D39RK@@a0zHwyr{o!jZvjJHZ|7w!reNZ`;ClYb@bW z%-~@-#_B zG_C?dEJ#$K6HoyM0y^lr#7x{EqzjFODUA?nz}FB(6q*fFJVjKz4c{=YRYb4!qs1DE zMOy3*aq$B{V7o-vMf3=SNzhM50MGyx#$lWUPKdiS{|Yep2#0nc5CjQ_yK9Fma!@lO zykeX%2GPbf>c$LFybYO=4+W%2C`ZdfM|9AWcC-dM`GysR2Nqq?7mY`IgfS(dBpGe7 ze8kaC>PIr+u^nYSfJ`OW)02TD$b!T@CzD8t%(8_vCW=hbB&EoTY!z7nvy8M-U1^3T z$=rv?Czo{7H!Z*9u&0@v$(!5`eZf=q!^xb~ z$(@8WpuE4KB+C7h7>FTMq|~U90Vx7pN~d(xkb=sPA*rcUK&ng)oVir3)YMJAO0Gl# z3SHkgK}(|&K@xnM+t@JvKJfRp%EgENVI zTf?_1tmGj$oX`olAPFpF9nQqU)Ir0?lALm5wZ5tBO@< zg5iV+`ndo<1jOS+&b27S-zo{2t2w&(ALK%;ZHq(`I05Tq0ZObyOYDs6>P`;&j861K zAppgu+e+DRS@fhS^~4SLRK+l$A^D6?_QIj+2#@>B&qUDAU1Yl&NrW0P+M_K{29b|* zAO~zjP&887PDn;}c(4bHFl$UBP6!34|5c+5?NAP#kPE3W7$ML|5F|n((abwhRQiT^ zfCn@=6L^r@xouGxwb8r9+Z@$fE%DL5%`qSqGR-5>Br{Sb)4eA}+=VO^#r-AW6BWc2 zCdVDVDD9NxV* z)_5h&ZPnK6=?RHlSM7;H&*b2``UuFXS95C!d|e#Kfe63&3me$Yu-uAP_)V-R*n{=A zgf)wW)h!QLxe@?@5|9BIAYzt-SkU>x;0mAsfa2nc&VJ2J>g3oHK!MW$g6!1Jk=4Wv z(ykx~0`OefOx>A|?b!1y3^g`IncWSVWkvYpryUv(@#sD_pszsy+M)$oMu4J3P>>qQ zS_@^``WWOi>I8ByhjFk*_z=7b&DsZv(JVmsB;nUs?7@h>);B}~k8I3|Em?v-;;V3DX`4TkEd zCfBBhICKro%ULTX|8CcKt-=caOeq}9@L}M%I<2>a2@2@fy&$$*%QdYTSUU_(QD}l3 zzyT3(EIxdI+}f=nHsT}p>k>%Lh&@C^d`<#@;sCH%o$FVc*jSEDfh=Z$E#~5q%`Q$9 zJn04csg=6FJjpLx9o0ZS(c*W@$7b6M}B$DkU`dRp>1f)G9 zPw0e0w$S;=Z3CsEtkrF-<%Al6kK%@r3h~+x6A?JtFc;xuNboNJtr4?D+jCU06WzQN zy#^q=22}=cRi;~3UeQ;sQS%19SjJIWX74ev<-jE}T_#*!ZZh5bWo72QC`0DQ9X`qJ zZ~R_nEOW>x|9xg?))j7;W?4ya&0X*@(^70cv(Y_<(rvSmOx0rI9ZPVXp zB`xo%OPb!*psrRi_bkR*h>U19Yo(lYrQoNI>O9ZjE2QdjWu4I+9T6t1D->6K<2R3R zR*z`&fpAvKDJvJ&h-^X)CK%|_^& zorD;fk#Ee<6!{Pe;ba+kgaE~nNVslvT%}YB?|~2Rxn*VajuIMmF@)bF_14?=ZtwSg zy&)4w`Ti67ZZcoKZvcnVPT_ctC+22WzGsFe1kc=)H~Ew|`EF?NXR@Yi#%5zFmgzf& zWteaZCsWjoGu35X)^%Mrg(uqWaPxB)IgQEI4)OKV(|pn0nndvwm%raN7=FoTKpoym z|1*Mp9@GKczvNw1;{6!qZPXnn`;(beh*rRodT6Kw@~XTUiXQT~*UF5RwT<@PuvGH! zW%9BaX_D3pWYfbb4|6b2Y8HgH7}RnVjLX4);F~tY7>Y=w+Sj1e5L{` ze~lVZz?w@Z{yNO`_6g1=;B*nN0O3)&AtrSikp3esf$G-)voJ)ssEfnqewzy}w6*}4 z*nkd@^+-fx$c}8pcmiJU_0JfBAb5Y3RoP&N`%zqh@*G7pMj`aX81)1LfIuQ}|DZrH z1`i@c7-k{Eh7KQwF=K`e8;KIhSd{2zBgc(_I{pbMC}hY%CNFg&H?9-QPLnu!V(Dq7 zCr&nR-t=^i9L=6SYvP0?RA{E6LUD2;YSidZNJXD6g_=p|qpDUPG0GZgt0YO!qD7M? zR$8^PWv`)4i#Fc1cy8aqjVpIXW6rF3v)ay{Kc7Wg?V8!rW~ZS}t$OupXs%zwjx8J7v)Z$6IT|4;h|J%)rM}K~N z_h#;{~Dn3+&i&aoT#fvY-SfhIpo6KW>R`bLtFqea2pzo2DhaES|4^%~x7PZCt}yTl z!wbIZ8f>t*-s*}&2*xG6b$X=VRw%RgF!mhve3M{z1&M*VH zG*BJ21{plSKms2NAV2_P zlU+6e1VBuI1=?=Vwh3>)eZmPS(2XV#LOj7F6jJcbHxxtg|M-LuQ2fs`~z zASU5HiS8-2#FFllbn+8YHtBTEPQvGe(^E}3#ne=fFdsehObOM9^^H`;$Rd9P(!C*u zMDo2?wTWd~XrIxQzWVFiWtU!iSp&aeh7D$oGxg7(KVOjX-@pHx0Wg399N;>xA(_u0 z&@<;Fjrq#Lng_OK8nc-o1)qVO3nB+N#32p_JLtjXGZ z!V{K6s0a@Nls zQ$5RA*OFGfZuJ6h?Mhwi5>_cg87)$Vl3L1YmaK4fN>!$c;rfKkk1B!gE7W~H$ZRMTHy zLjc0UCV+yyvj7P2*EvIgvL4_QpQhRYuTHtF|CjBnRi=W0&0z3JQ|)XOK@-~18tTxZ zCCwF0V44VOB{iza;A&T!n$|SXwRILCY-Jni*b0y~3b1VhaEsgA>gIyN0U-)`i$dR| z5QQKJK?rxtso~f}H#!>8H6$XZK6OG7LERrZ;s=UM#0-8& z1XsJ)y+I_xcDd7CRdffFn2aN>X$@ZRJi(Kn_=FR{>&ftN@)DaYuX)sy9$$xYm8xKG zdw3Wu9*W2ZL+}9+wRy%^$YK@*u48?Yoh)72cbE6+FSDB6tp7Ue*~F{^F$5efX*rX? z(~3qkqiNu2An4lEP%yT!vCRi-8$#yT|2DT5RL%%{`sv-9E$InQ3fxS26s0->_>TXLXtShax#BR%2dLjn8B<8F>BytCl^zdx|-Iz@Wo460XdpMp0bhiwJ(k>Kw|6! znZwFF=4}?t%-$4P$NVMEl9jVs|K`j0}b8oHaRF?|9J*|>+W+J?af%(Tuvd#rR@fzV_X^OpBzXA~7kAX54R+&`8HUK50t_ z4%6Bd?Dn@~sgG}JaD)X(NHo<6?-<^@piIE`zpp^U8-^qkJpAD%RC2_YH1Vf68LAYc zN@gr}=9Oc-c-ZxGPg*H z%FN68Rq(QyH6wOrgqb<`W|pVHgs)~cx4B{%D;ceLh2s#k`OJ9Ea{(A&vT*r%6uX#| zM4N!m9e{ra<*HT&{}jz=B_K4Cj|%ZZCGGx6|Ljo%g+UB3no*5r&C?!D0RIu-PO_OA z0GQg?yc5Jszyw@C+iU;_FyO11zz2MQ+|UgQ*bNKpR8C=_PTiUixXA=2j<5L|uo+bg ztPxUqK~fzXLWltvG!b}ZL`9&^>a30*;12Eh0ZCNVAauewl*2ew0#~5~IkdziXxs1n zPVcCdIj{pen8P@Lo4Fy+yK&n~gu+b76}~~wRNxz5HA3}V&lg?~BkUXO7?BYb0v{xn zFZjZ1n2$AlMr0{m93~vYHC$%hk6=U`9_pdQ5yr*&A!LM>I&9n^j#kH=*2l4y$SI-( zm7Hv`+#^C_|83#ca=e_&nUHm02X(|y&2i#!-5fVC*UpJzbWxWMQP(N{0uNaic4e2* z9bFN5*LN{p6M=|_gpSnVVv1amitu99W!*1+5s+{l*GY*P8A;ygmyxW|lo;3?wcRtC z9W#PSfx%rhR%4rBfzyte6t!h08%onLh#<>Lpo|x!yxUB>kJX-tQHk!|-28u9NYhBmy8G1MrJDy&1-I3qtnF2xJV!NZ<5@ zO~F{7{|LZ9_<>&!>;g9Y%%pf<4}>3+`HD1|-zPQN`aPP@ykAthpU)`GMCkyp)F0JY zjTd+Ur^$f+X+Wsi8L0(;016=4yc57I00Jst12W(Pnn0{kAPc?M45ALSafIvOj!6hYWme`OTmlcWLpgLpB@kin zbV3mxp-g}#OE}>;n1eg815dP-T$$DIOhQ#4#a{u|BU}$v+}rh7<{(&R_xJ%IG)NKI zfgR+59_T?KAOgVo0x%2%!I^~{c7_~Er@~oQ`_y6n+|L~fhF{cAcIF`;`o$lLXJim! z|9KLSAtDgSm4<3m!y>juBgO_Wzy>fxVtv|YaVSS{G)E=&Rtb5>b#!8Ydg5`7;wbvu z4k2jJ2_1l7R}gJi0DeG$zZo785@p0JqLSc0#7Arda2nBY4ySP<$SkPgSUAu$RD)l5 z#&l{db<&|;*x_J!XT*gpcpAodnyhG=zU*Zl4h8;BnZIA}Qi2sp7pOJUZSy)}uXkUX{KWvS6u<5et`<9zoKIn1bn!bzUfC zFe)k-#s3-|3o5Qqm-)-Xu=W6UzK#KK+@ee(IwP+Ne5j^O?$%DGC!f!T+TEjH{Zj zLs6yt=|H*I9}RS6S9aQ`J%Fydldqa30TzH-4l4&Npj%FBOU)&mG;6a4um^siv_dPj z?nzO#(dC?=7t}!n*TIH-!7PsJxYiEt2*PA$8%wC`RiFe9_8`2Y=v+HEPr9gpsn(v3Y+w1F??oF;`l8?Z&cLj? zuUBeKu7Z?E+3x_Rr2?#_0=A9+vQ!EHFa8eUvYS9@fM4x7ke=nr>Dz?92ujA8PBI0+iV+y_R2BGXv47x(Xkz) zcF?*<9_w*3*vEk)D9|mfA2+Cj9_JuWtLnv}1t5+9vfkUv!)O9V5Se+zi-H+JF zd{Oe*3JE5U(TW;D-iV!lg>o9%QQNUymxMAYfAW}UxBn@Nca91YgrPE<++8fI_u$TQ zE#ERO=W^mPZsR%Wla>lF(@Zll(=rir=gJZ^8CvEhvoUvR?M`l$KGR0>3OC2D>}In$ zGdS$Z?lB?LvD`DOAhRzi*+lx&H0?|8eN#BW**U>XI`vBev>C~SK$hW3nZBt{Hg7-E zq%{GwNV!w>Q7=9Pu@DDkLW3$tmrJn33asb~Fzo zsDX{xl(eY@>jGRr0=i`bLSW;lK(bEYn#?p^(sWIuKnmcrw8qW<{#xK2ik!EA3(x?w z26a$dPUmnA1lPeG9JNsc`kzP0xSE7pJKMTSX8%=R0##oH5o&d$cW_syFuhvEU6plN zVKr^iuw_=oAY8?>0cV34^$*wejtlW!tNMU=HZmZCUl)d8zmHseLt)!GJh+AXT<83N z>|)!GV?Xx9Nj4W#HX#}i$60n~V0LC}_RN~G8qdNShxW985N?%rf2MY}bK-m$?asNj zYrDs{mm(i4tsnn!(LE^AK?tGiHWNLSZ^JuruSjuMUD#UPaU=JQkZmRRh}l9nlAtIu zhMgPn2!XvVnRxOi7g%=(*mygfnTJoD7foJIRBLC?zc#DLvC|J*Zk{EI7Q+TkWtGEbS^`Z z%jw#@F&Wx2eK?2%Ovg0pKau$E9jZ8KOqSxVOwIs|JKw8N0KnAv^x=3<8nkiVH7pQ= zQ2KZiY;?K|iwAhXwZQ!g#J~$oH2Jo|lIuOvw1U#aD*Z|MrpZ7I=->Q~G?v>hu*wrk zBVYpdFPKLlo2S5-t9hEM`2_MBo3GU7!+BuRd7WF0KoCLakbdcRPPW#;gGexhKwDE^ z@MHqQy2}1ZTmrhL>!TAPq!-~M=)PzYp=**A?{E55up6fbYz-rSNPI+F`+;zp`or3_ zs^7INz`}sY0)W`;tG{}70*0*1djCAsI$pR%Uf6mQTh=;YmK0NQ6|;X}RB^BmJFyqL z$|k#7V0N>^7H7*RG(dZ_OFKZ!5;%}xL4yYoCRDhPVMBs_AV!opkz&P(-n?dnj}}ge7P&({N{(5^#=1@GTGgcsi-L;3I-I*dp^f_;1TB;dy<@j`xm`}gtRACaGgd-dZ1bZ@>F zUVy>C8EQyS!37y?um%JlG!TXYC#0~#182xk!wntmaKj8Gl#sv?N3^d!_(&wszy(1B zu|oPt5RU>17^qQ!8*9vwf(%0FF@*Qx+Yi3-%A+wy9ew;Uz7UygQo00Fq{vH%1a5FtuE_9$}?Sau;sn^xFtlTBBeP=Y%H34Cun5AZBd2`5}>^OZjV z4OGxU2`$vnKiOO*IsY9DjKNVEWT1ftFT9{Zh8RlFK!XetNI=Ui1qc9uQAZ6xfG-nR zV1frO*nopqUp3)_4^pT#1r=~r0R_2YqkX!f(woa zF1+}H(rdY(R*WyK6$6lOzx6|0KL8;Y+;P!GcaU}2W%rVI-)(mgcwx+u4slg6gYIVpi+w8N^PFwA@%U;Lrx8aUk?z!o%+itk8 zS?A}y`R@DYY5)&haKWc3-0;H@PrPtw7;oJ1$AJL`n#d!cg>r{5&s_7(Ik(93&neP~ zq|r$)ouiddXDOwZSWkwg*K5K__Fs7F=_jCsDvGE(>PU)rrNmh3DX5|nqpRbQPhNSk zzOpJTu+aKSEx4$!9<93UvP&*1=Hgzj@4?UO2_yWv%dx`HSFEzhqM*#O$k3N;{m|&I z-~RjYXAHH|jM(3Q)_4;@0S=IW1*FYyqJ@Ow5Jw40V9o=X;~ZB=hk{MO&IPq|1MYkW zJmwJ(k^cY`9{>1t(0Yg6d=o3pmf$NX@G=l z&9YjQ;?^z2PzR>e0T6}&SGme%u3rxGm+q?9CFXUBP8^e&@FLhV`?an|Gy-4;TNuL{ zcK^*sG)xeGSeL{m#=E18vkn>4SjRk8CXlTY7P_Ft?11r$l&OqmT#Fjc@R`q>`HgS! z0GiN%=1-ydlV|Wa+CksuG@6l3Y+Ae8L$Btwu1&O|6^&Zitid*oZj__ySO?ke7E+Op zbZ-1Ksn4o`(!s41aEf!OOCJ|g$We}_0|5r-aGFz{GNcaz0o_kOhY`~am8jg^Nw>+_ql`CDKO7qGRma04tENc-9 z71mKZ=1f^RT@nM?Wr8^8EH<}m6@jQT7y*!Sg+v5j@CWB(Uf(*LX` zH3qcoWigvsXC-if#%Uk~LED7qP*6J6xnOp-(;W_WU`OV0EqVeZp#5x7J}^q*eEMS_ z+u{~Q^dS+7O!OZXhVX?Un&EL9Bt#Jru|Pu95Qda1#1{ZjhcNii5{Wol0gcFubXqQq zggc`rVv$Ev#19PWQzh|6u{=}UB6qt;p*tF}J?Al!8PUk40)z<$WAfN8v=K)^wFyph zy5n#=;DHzLv5&0~WFT1)VF^FD6@+XQA`^M7OU1yEkL;8r^Q+%4sfv>xcohgh5K2+5 zc*Ukf!LXKPtYU$(R`&ywp8fi&`l%$omwB7D(QkHJI z8ZY(qG-N7M%1w@@m#f@P7t&KyuR7JU0P3qRQdC)ws#Tv7U|KI+i}_6^}4rLaqBfOk0}gc z1bc)iG-loMOH5@DI~m13mfrP-Y-A*x@6%8=v;Fq>zYo}~XeFq#pZ^VQXeUToMOn~- z7}VefIcNdawiblLm93Cydt3cvT(<-A?F~~TAK?xcwj$gQd^v>N87dd#%ngx?T27(~ z&0M(>Qlb)PZbSO2=ZF@jA$&th&Oow3~<22DYg}hAwNoBDN9&1wv~;2;{qDEK=aX}RF{7Yde8$R z5s4`Bkx?%%Ca>O^(tJefqr5I|&Yt$O|3f#y>4#m`ftHlA!~by38Rm3;tjz61bDH1z z3pTIp%~^ZdH)2L->B~9O)!*CQh$gqZebi@-HuRxc*8Jwfxf)dSexoOyevQV>qnCDn zrLF%rPH+0to(^?POP&9l-jvn-_dn(;!qs36bTVQiW(_2cil}TY0hP+v9I&Z?4R(Yr zC#I?ws_GC5K@W0Ace>1Xn5}rAEd)bQt62<1)AP6wK9=q6wScBJjz&X3}bQ0A`gR6!I}ffews!t{<& z`c6`Izzdc@N@jorHl;>BtnlUIan*Zm;$l<_-8!5ZZtZ0Me_P!diNd z7=e#CdY}h}ulR~D&C+bmj$s*?L1mP|YM^iWF#mGStO07`uOqi_ZuTsp+~y;@4{E&c zY7$NS7A+;WMsTd5{2uN68cO|WvTZ)}Qe8&Ts zt=UBIEtRKvOpq*?XRcQ8F7YZZyypdBurI%dF9IvE(x-g{%iZKh2Z`_q6>~A|CkgY7 zvH-{lC37-o0}7)>3O$Pot?&vJE;_alJ04E8I*3T1uHwdUgmTM-c5CCd%j4o>59On5oHLO=w#2<$e-35bCf%gz_OV}+dP73C8a(E|qf zs7>aM7X>9h?=DdC6Bm;}6!i0t@=i`B1j7<(2Z%#TknxcQkMIsJLY*=3FaQHQ0L2_H zk%(YJH}o2@F&kBY#xTz}B&9^f5ec|p9KE2N^1u%2K&y}HvPc0kNxf<+!~hJOR16BzAfrS<^&lawv`j`JOSNW^YciWteXz6OB%p@6A?5aF{`Gx+ZXB zGHhzHCU>$>;jbrua&UqYri#)ik23$3GEyZ~A_VX$J%=NtawE_C#fgT2?d<0HG*;X|CU-*l$NHHWUbUnw={9HbQeZp7aZ4dz0@JaR3=QK zOwF`q(lm4PX=>QCBSXq>7^={$CQnH>B}*4@_LNUuGEfCIqXsqo3^jJ?hD{R{C>J$x z8ud{hRZ@A^|19+>qyKU$t@75WvQs_vc(*~9vLoZ5X%TU z9dgvjp+_RlYkd_c2HQM6;f7C=mSB8RzZh@L0L-~KTK&6 zpi?%9RW#s2GgMMGv|7HP2#O$*J9KL~Z}UFXS!keH#+GceC0k~Rmx2OZ3gKMN(GLaz zTzu3U*>hy zPj=xMZ#>c`Yd3Ii7k3>;avW86A+>k?nbmsgcR@!}jmlFCx+;ekd69Q{m-l%kP%MdU zdV^wPkpE3BV-!}kcX_zCDmI!bq)pn!0es?$EGtQ-ukzvKjVLYI)DebfQh<*EHes=<2V!;IlMJF9N2*&ID(VFf|P)Q z!Ncjs1B1^)V>g(C6Lz)+7B-V;tQ|4EHnt2u4!&L(LUMCM2v)joc(#m_gziXTci7_8 z!(yEiiXB#n*^3e{ZiJlf5SN&Vp?HiHAd0U9J0tO9LFG%Vm;^}imvz7i1guahY!&20 zjBR9z%@`IZKmja337{j6YZe#nZo+bwj^p@b^*9L(bUzSOQlJEorQ`)hfMOS*Q+S)V zHUCMG7x`(0){%+emW-Q2Jrt9#Q3W)4lYyg`xd3pbdzS#A5YjOn+i`8bCA;Oem0|fF z+eII{Nn9RgT#}RxjHlVa;FH%oMN{-dV~GY9q;QLI350o=iCIgJ`EiTE7L<9JdChXm zG@1!qW~7;#(^Muo@|xpMZ@Bqq=5!_PRGh_coac}EtRbE4iJjfKqi!;u;kk3`SyAu# zaPoQ7_<8@3@}F5;r<$@-1$rVr!T?K0p^>+s58B4FlA%S_p_i*;-$xDFvy26%uO-W?XZ?L2l4mZcK>iQ z?Du|sy3HHQGypiV;ykj7y3PgYm3+D26u1eTpsAhusV8W(qFOm%yN*QD0t_~T54NlG zV>KVqh|(~vxy$FSYpo@uI>`{y<@M#-`h|znJaB(E~M2-G{Xf)*0Jlq4NNE9Y+v*h<_N8J|zKaq(?@UNtB>Zde&!E>q-=$*Q0Yj zDPRF8KxR{$?*0?CC+ron9YAj&2~s;1y_h?W69h0!zNb_{sH8j?V7GlckskoKFSJ&K zwranicaq|ksJ26^(UP0xk~=wpyZ{NL`$?aox~==Vb2Ph&DV5u0;p;XZXa6tCz$y0v z(yK5&48TC++dB%fr7(JV;2H#&?;CORJ8_Mf82bCa!?byop&10cA_;uv5j=C*8NxS` z!P)fu@RY)Rp7~HWQC9|?V^StNoTES-#A%nF>$${DoN-b->UmcdTD<>a{8D92$F+Xz z7cd!;m&YB@$72VgYp2*SFawDk*|tiTo`Ol0JS#dHD?Yjlq`;${XDrT2Evi5Y-oh-# z*QD=id$fFg1%oco{IJ4&rXd5da+;^z{PCd`sHL@k4ugM$Ix_7%^JU|x6L`=4T(qD% zsyma=8;CnhAJJXNu8GS(O5Lk9Jq=$oteb?oV22$>UsuUHO?9J3IT?dHwpKeTj{(iA$5{h&@Njv%i=G2X0_y zmt9;p+X8|ZON98d7hts67`1UR!sOqyxxL%HSUUn#7wl5MhuYk%0mQ1_?4QSn#0Z1q>K8c<=xsMG6@-Xb@59SO^ zaKW=D&lWV02px*V3z(xwlZsi&R7@Q}iK0r4I;bijKz^=b^^;X=)vtrJUajiq&!9hC z)A|vVmW^AtW|oFIIu|JyE>Vu?)l0N55{Q6z2p&ARhvCD9NB=2a%((HWTDyqZnp~`M zv1FJtCsW3`Gv{ugLx20$ZM5mrs8g$6t=gLF*RW&Detm8BwcEIJ>vpZXx9{7tgIjav zY&f&y$dfByzPy_A=g*HjS1!D|YjxPOYv0bjyZ7wt!iyhIzP$PK=+lS4w(ht4+tB07 zhd!;o{rmXwL)*U}nE(F(1}GqavlM9Hfe0q3pezbD=-`78Mkt|yeN<@Sg&1b2VTIgu z=;4PTdbrJqB$jC6i72LMqGl|%=pu{9#3XUPl00=@CX4 zu~(*=YFcTgdUeX_sHB!^>Zz!vs_Lq&w(9DuoU$P6sIt~->#Vohy27n1^y=%czy>Sq zu*4Q??6JrS+rqNUE<2P%&^n~Vv`tiN?X}o8;mWq$y0Xf*;D#&ixYZ^xtr9w2H<;$H9$=9$Rv~8Fbp$9JTkuUcK=|JMJ?CcGP^Nn5Od2EOkmLjJon6i z0t^KGvjRX9t-t|DBTcl@ODFBL(F|CWfz2IEU3En-XKhi`LmN#r0tk35_R&t4%{0_O zXFc`QFAFVn2sk8+0}kryki;sjyrTEse7EBFw@sjH!9`z#P4q@QD?ot~-m2pGU8UCc+;cSu_h@a;h97Ua zB^Q)O-G!I>>>r{25zr6yF=2us)`MgCp0Llz^P4cVk5!#_(mPLd7yEa;SA<@(1X=T&U~T+9cF|ugw|k&24VA^7P`rjV! zW=O*tmdAqb8KDlJlb;^yhd=!pkPrtn3t&vBK@6IOES8wWBRcVkP&`l{3bdgrTCooy z%3_DM!3`C8@rz*G#*4;C#u}ONjK|PXj(pUkAO(pKgeXKIh?ECA9LY#aS`ziV#K%7R zk&j>sQy{6tCN!BzPKJzA6%=`=M$TzZkK|J%3q{FF4k}TJ3KXLlHKzK#{ zm$lASH+$J@X7Qp~G@aS5g5k@W*31|-4Yo0bq3mJcOj*e)2C#eK%bX)i7{eg4PIiVY zVdIP^#Zu-ll^sl)F4GzXYF0C<-3(_rOWfE7N;anzz-(nZ=m8FjHhntOZ9*fQ*uaK> z11wE!Nh^RxHTpEKMf7EBYgY)c7PJtQR0Jrc8xN*+H^1@irLXYY-&PSg99ZCI6gAx8 zezv&AMee7gD;?%8r#aMp4s=Nv-B68cftax_1~aIEw5A0En$?bIx4XdZc-OlWs6YiQ z@j^>pLOkQiq$W05o=%#_lmGZh4-C|6iXWJgm8pP5d)><``M5W}^1%g5M~Ty2DuowH z!7qM&2@L%jV!y=X@3D{BUoHBF3u9PzjAHamHw=it&Xxu=3=C~+R!G{?O3)fOd{1eK z)4>nA7KA&Dj|oFaofWF%Ixoy^Zf(fh-rg{^y@~AzeMsDC0C9-O6(SUyXdossXo*pL zq7kDjp(|P!Lrc`6cEiYB6(xg2WDM^Z(MaAHsZmF4Dw7U|Fr*?Cs!RpyQ=$x&hVwGY zD7f;&AP%vJRY}Vd%m1=hveKoBSIpvL@se4-jMllB;DljXtC%=WrjEt6%xTpvV&|l$ zkcX^IZEo|(NT!%Kzu7R5g)C+EBvOG%$v4>IYoB(ww1+Zqdwfz%b zSmW6O2--BWZFHjsJ?NViYEhu2P0Vg%^FYH^wt_Bn&UE(ZoyQ!4jKPy483=)*7mZQ} z;D86#`j$*#`cj#;f~HN-fekExw48=b0SovU0~ogophj+Td>d-!iV8Z2NI*bruYQ#V!ux_4U{XA@(xeDnQ0rQKa#*4$WqNVV zc3l$@7O`w4um5f#pI_m^h9^yl3h0v)82Hr5OSz9Pi2X}oez^quK{kJq1uh(e>lmQMq5AKc~e6hUC(76JhFnSjarKgLlGHVp0w=mGd>uE2B)yTOL`L z>-lARVNJ{+HS?KUR*?yGt31$A-pdYo7D%#Lc zCMQbAF9HWd0Me4SG^Hsm(^a^l2|Tbt0}P;1iW+Ur2hc$iR6%aN5glp##IOsA0gCl)~qY=TT0mSAzU-bhiAv|Q&Y|RD}Gf@O- z6>T_?5O z5dV6x1VhpTdvHJZwix-AZ~b!%{pN2*hZ$m|A_n(`r9m19w?Nh~8Vh%Z3|B#_b%qny zhSG6D!ZllOh#Y9RaUFMuF_ecg1af?s9_%4<@No?!cXHEE4JcA*K$KtME>z0 z&IMgc6o~~AiO^MZ(p4ZhmvhxM3p;0BOyqMS5_F_UbVYY`sF(~%hek_>UTpM6P)8(1 zf+TieM|og%^_6w^)pdfDU%c2Qg2W~S<|buFV1vSLXa`Bj*mjy!C~p^c7Up4x@?ahY zc+og16$UDvL}7i0D%D7M;24gC2TP=qc;?6gjhBw z^wKtNqfcZue8kslex^`uwtOZDHYRyC5G88IhfvpteafeOV-qwXH8BgrWP%|Pb2B$K zfPR+dQtQWl?U!j4&;T1{I1pt4`v-tb34o;YQmVFU2iR%}=sBWLYDV>diUTt(gKIjV zYf3N>7x*&=kW&eOI~YI`#-;)wm=Z+b63j+|cwmChMg;1E6Yxe9>=T1XF@tec2VL^_ z4OEAwxo~S(TD0Yctce^uB!|**9H(iAceq>OAwzrEhq_4~fH-o4c!)p5h{EZJj|dF3 zFmsj&bIO@S$;pY%`9z;+Mb0IPAySInm5N)a8QD2rt4JfQ=!!n#bWj&ZL{f`&WQ(_W z2e`OLVWM?`^q%c0CRrk%Rzd}0VxM0k1!3Sw0v2G!IAD8XNq@qOl!QqJT8-7XN!Pe2 zj*=;VH;t#ncXMZ0eJ4t<5_o|pjvBh5ta6U#xQ-wiqU|UYQuRv{Xk+x~E%vyg_~>JG zqXQK~kk}+J1nH046nhp^PB)r*;RF$b!A>V5kp%Nh^Kvr}Nqgr+F#lgBdjMH`7m1N1 z6Oy$9Q6L3UAcbVV z45=}j-ugfdhgz_aL8`f$ttoNlI$N(f9duZSwdrwrSRUB1oB#CMo4E0tz?pKwxv%~~ z3;ueX1>&#CIj}OPM3vY?m^dMiNSx34AfPCnkw~3eWSyn>BA1m6o|%f8aSW>1oig&B zYs5x`@FU~tUb2XuRkxn(sf+tnCi6KaU?QJbGA8KuB?Pue|5=Oys&)kGj0LJFiZUv2 z=b%9AC?1xef0tpRGD>)-jUV=492&J!dnz7UE4zY@x)P#Vn~pCgKav-Zl$WBJcWE<) zOq&BZo9CkH0%SO9dTwiaLv~I3f_gp55QOnDB2zL<3QcD=d-URv+Eg+N(`B!xkzuxy zgH{p37ca7hX2n-HT^hM=no}uRXJeD5g4$<@n`a7ulK&gUrfn*yNZFBNmH~5$Wp>&F zJAfFYKnkv~r+gZ_?bkUKKz|2SsA6dWlp3i>)oMxA3W}O)M8#^e2C22XyOgRl5Ll%1 z0s}AFsbm9a2!K1I`hjlwmT{S?H1P$j+N(lggh)OLjB ztHCO)!}?2hAdAMj2e8l>yD$p-%fHF0to+uQ*5si z5{#MKBJ z_pde#umMX8OeC-bONq!yU7Ogj4l4@~+ryS9vHzn;v0)Ug+o^?_aj^k(v14=@9qX~) z`JL&-Bf8*5Kq8B?cqDdIiz$$9BgxZ5P7Z+oNVBxC_OFy5qkiv==J zD$DP3rNdVc_ym#}Be*v?PAmg29ErGUV>R<)F;|l_U-P+=dy<|;xpRh4*;kgH2B(`F zGztJ{Y+8RsGicvuFg$9v^~1V~;kvLJyZ`d+Hw{>n25_c27S*=Gktw)f%&Whbb|vTzyJuKrh>W=7tmE72!f^>6C@ZD%eJcG8`81Lmq;-e zhxvo)i_+^$7wK~s$~d5T!eHVXzw$f3&{DtlYpk%4zx=BhyYSOL{TTg24EwX0SQx<1 z>Td?T)FV=@6uZEkMH<8*hEr`Cti@Wxk=3q29I?UG)=?Z2TpbNZuHiZxuZh9vI*00d z!8&AHc8FUf3`6mHoAZhuD!jse*d8qmA1_RZFuaH~j9j!}oP&MChHb>n8FN6aiHt48 zl{iHfvP2nz*aM5i39Q5@VhowRo&OkXbXpk2TbQvdQW;i!#jTjdKf=Xc{Ka4_#$$Xw zfYc>tykD|?#%4UTU!ulwEXQ1uj?F%4w^%vCOt@TgwD~%fx&y1i54m!_I=?WDv7t5))*?JmCPf(5I(l z7(Oz@%*@S9rBVaUfg5{RIy4hq0HNEZ*__S4mH^r8d<&IP-mK!>N2Mznlc1|n+*i6& zV`K=k;Dw>T#E=Ru)W+X(jiU0EDZ*K#OGCl zCj)w50;*tCAiiGkt2GUowHPfpU939I(~A+*{QJ{GP1MAI)B*h2O1;!fjoBj-8k_~y z&d?3qI@MME4OgA&s-Eh@0oJd<)mZJ-8dMEtP3yC1acG^v<~oS+;Tp95>%tM&B^AO7KTZFtjK{(v>8Szd)F$?9gPm!$eXmt51-v0|4OuSc(x+)CuYf6``wFI2jgAl zEZ_3zO%Lcm2qapf&@wGdK;OhG%(66FBP$7C<(eJKDiXd z;t81K%g;o)6Q{pCG&Y~+crVI7@GPqHt1FNeTm7WUNFyuvE-ixi3em<~~k)~^SR zJ|y?M(>v`LK)nn4Mp>Eetd*72pUvr=9<82UKwlW@put+GzUuNn|E%uS^#2+j3>&{L zAJ)MCz77!8s#zmg&>%s939Tti*svNih!G`Dq*$@yLx}>JIpoN3;lP6-)uFSdZX`OB zDOIjynR1=FbunMUR2dVdOqV!i?&R6i=g*$kgbpQIv}mQBR>3j^y$+_(H_P9d-(C?&yVutN&WdojJ!8uzkhxG`U`Ns0G}}8h$xOw@Cf}B z9PmL12V_vc`wX?Cz_CQ$|hW~@=7aL(Q?aHy7cl( zFuPP`OftvRQWP|&baKr#b#PM$7~+KC1v*Kv^G-bTB!SL4_4L!v5ds~d140Y!Ku|>O zd|}Q-LP{1B; zyY-e^5u&Bw)(k>Gw1ZI@z&2R{1V9#nS;xh7&pB7kG)^~r7-bY!u)!wGR$dW!VE=*( zHuzwITM;FR3L3WH1~zrDU}6gxIDh~HZV;u*S6K1*V~{;A6U`eMHh=(>4QRjsmJfIr zfdm#{VB8(lIr3(li=+n;B6=?33!v{1dgwcd1N!JLxBz2mFt~8~X{eoMy6L6;$meRT zv&LEx@W9i~Ybw}-FYNciW=CtZ)7F|Fw%d05ZMfr>+wFep#-}k{Br_%(zWet3Z@&{0 zJh5(+G5qktyHUIwXA)nWac3fzd~(VwxBPOJ8 z(my|lB!WmnXZG1!viCnReQJcc6k7KB$&`@PPp>-)8^0)PCsx;OuPvj9`Suff|dEStm@Q%o|D)gQk;wK9F;m?0MbRqXNh(QiI(1aqi!w3

JeEicuG1w1OA$NQ`47qm7WDhrRFV>wuCygC0ZflyDpMcNL?t#w>`icL6rFOFCq8XTSFB>ypZ^@msY8M4P^miP zo$dvxNbR6fkFpe{9>pt0^+`~YgcYG;bxKnaYLuv=Y()Ui5;&CvEAg7yxTp z*IJjdngz3GMJrwu2thGJFf9gD%UIcBfEr;i%yF4(lBw!I1{hGRY`Lod@RHV{?4+qZ zSrT75P(mGDu}6e;>|^O<=PMMJgpySNVu6&{#4JXD3N)chtRPs(SkXr`k*oqIBR~KG zfH4Ccz-2FsSqJuz#x+J1XYDY=(SmjdGYm}(7DZaqq!u-hav^C?1A`ydI1VX9A*CuM z8w}sWg_cIaX%LlYO>J6Je&}s)+1M%Id_@byij0LT2|m+Tl*DEAid$Y|=Zl4o|IWy+-kn_g0~BRUpl4p7iVr zJ?rIFEa*!M`RH;LzXnzoYvF5Q`LaIs1vN47GYsDpLzu?Q&wiBAUu1OZnEhSme*hE> zXap!40-~lhx*%;YYEv5pGVp=7k)UrX2%HOIaD&ac4hKW%9NJn3gwxs1c23Ab;D!x7 z>{+3Ah#N!V&M>AmWG)Wta~~T*7m80Lkbe@ipa5YPLJ6|sfUpRmC{l5{-`ygJ$Xj0Y zw&+AG@?v|xSVs89cSbD;#!c-@By}+1Nl~Js9kYbTJ^uz+OnoF19swChB@7Zyn(EW4 zT2-e+Dl$)%#8V?VMS@jIvXywcBql%E$xebY!kik^t3CzGbfH+16abZp(S_nz-pX8u zT$C+s{HR=FxSH2oX12EJECmQtRK_%Bpo}T2StX#y$ZBTJU?4AY0@op z%$s!5RK4yb0&-UAN&su8I>*G%G8c>$U4m!B<|#;f8Xy1`&_*lPsm_oA6isbDnL!VV zvW32k0l&C!p@mcqjDA6AX0Yf+IqFd`bm0q6OWH_7`ZSZOaUAoZ0!(Fk>8H`u(4)R- zP8riTT>MnkKUJ*Yi2CZoNe-z?WolBL>Wrk)`v0jHk!!E3s#Rd0P9v=IHR)(~Y-^yT zc4HkY?`UEYoVWzqYo+#D;d(rzSe35ZzH7I!qE~QVk1Xd4Y`M+N7Q?2ydx%YJs|Ul_ z_rVX|gSqVeEUQ1AS~fGA!OUj=_t^lZh8G3w1!)Zq3)Ir4Hmk)AZzi}K-n=%p%Aq)Q zq*I*`UOYOstwM8pyPfiM=eHkcA=p}Y+!nI1xhrRRbg@WYBtA%q>CKRL#XCjs7Kps! zy*bT&{`2y7F+lERfqacl#zFvz)b{O%E|kDuD)|?{0v0fV3w)+k9GISiyjPzX8DX$D z_>mK)CMhFX;wf|ZUiYd2CP6GGuVXmF!T$=CDN6;d6vu03 zn>*mg(hJ=WMF7pw9OXXHn)3xoHz#Tyg<7U_wrMGVTK!(|f~c+k{+pS)r>myFPu-0e zSigF5M75l)Z(TY6vo-&l9APUq19XUu2)1DuhG2^bjv%%Jbckc4on)&Wk~j%wyB(d- zz-sG2o@lF|xVEE69KtB zirb*sx~<&OE!^sYjzf;%T0`V2E){~IlxvTcn?w81Ap{Ac{XnAoAP^3L5F^T>9Wo*d zvAGN3IqIUWmz$zQ)FPfcFQ9uw5Ah-wA-WYgI!m+>FQ5nbyDxfxI&-q4siQi8QH55p zx~t1NIzli7Tf0X3y08;FJ%Po`TfIp#JG8SrwOhMd0s(1lM_y{03EOr*lVYdSs2f^A3%m@US*XDqZ2ya~m<1fvK^?@w9`wPR+=d`TOu_J}%gVRLBtj+htR{5ACnO*# zG!26@pesBrE!@Hg>W$wJ4l(#bF=})VU0?5GVQ}z9sKb&_6va_A#Z#oCCQwDL>$S7km?RQ&M{)c+((@$+ke3l~MNwis9Uumdxjli&v*Z(n;!CqISr~_* z7<|+L){_+k5WaJANPn6=-5V%5YrcwnKIkg|cj*D86VIDshdKyJj@mx&13wRfnxwgd zlM1OXXh}6?N%zyz_u~hejMKkS%)`XVoYcSl!yG)-Kb_o30o1j~$tsM1h=-WUtI8^; zOw^||9fuf(2&_u0gw%$>N=gl@t(3Nwm7j+`aZ9*-!LlHW7~Gz|`b)qZthdmL@Bu7futB%jL0{#;!sLc+5LU%gknGmR+xg(%Ec%&bDw!a{}X%+LHxi33B^Jk8ZiP1*`M=OCfp z;*OCUId(md6iP0Xt5>l>x#8MPeGMY{K#&4?F6k@~51G02Dn#mR&gJ}}<3!F9F<9`b zxkJoOiA|CAqF71ioV!y&u>(C&0}WbQkvtBSmt#7l!$Z7GqR<)m6%x2m9{VK( zFg+;qP!Rp3P|`7SWR`bPqaDzdvFj93xh5;c$ZaycQvpXR3xSC_r-r;e*_%Dy(-?p( zGcOUCE?NJDHnRZ082?Qp%_b0jjIwQ)uuoOWI)yEaZ47IRqc&cxzygj z#Gbp1p19!ETJ_bzRJULy)>f0Z_c>No>nZxdH)h43XN3%Yi`LEZ3~C)9)X-LJ{e{e2 z4cF*aEL=En1x?-X!q}26F|@7KB*TzHj}l4`HAJBoy4T!{4>`PG;kws-{b20^keEXe zf(8GP5hhLwLD)gGP7gURh3!KQks=n(IfHe?iKV#}agm`Ly6*JOj2)vEXou3hDUStN zEfLu;@fbTJlTs`bJVHe^anCn_PnMOimj#rVT~WEy&;7*3Ovy#I>m=2)u$h&lzl)W< zBU)or;|y(MH#S;nDVIuW6i(tKUTnJ@yHE_JTFJXwFpfq{VH8N3mL6*|oY?^@zOb@G zGHgLxZHdv(vro5ey(LYvxush-^U-wr(Su>LlBpO|3ETo8fE!qa;=5$Tok%HNTq@mz zA(q@is9Z0F4yR!bkxH68Sfg?PU0#l$B_Q2bwy)Dg-PFCw)-{~RnB7<#O34vGrBeT9 zXtv!3qzK@Bz=?=TsO()ug@~n;2y8yeYL3*|sRr61XW`Y#;w7tT%hcrs%jYEuUz1+y zrC#gZ3RT5k>~%p{mCLf|=ehI>yp$gD&5QC?w>>!DbW30LMT{V1ti)8zpPIiRERRNxEhATey<2mT=S@VGUE*L=m- z@QP7%hw<>2rFU;a!z z0A}izs9`4NnWR&}Ne01i@4`6dXr6EScHL=4op841Zq{c0PE>A&N^sU)NUh3oPKa|x ziF97)OKoRr13|YUO9ONYv}B%nu3liUa8w28>cMC0Y1Odsa1Xy84OjocbNkC*J@K)K zh4fut_FYWGtUvgrXk(Bp`(f65b4+{NH~gJU0Sc}E%}m$O1y~sJlQv*2>kk z21eJI4k7TcX)36K3TDF$c0+pAO&ZGSoc8JXSP%q3kS8D_>4MlI5+bDrxNy+EYV=Z(2l;BRzF4u&krpuTHOhx}2!}%`gwV8uLO6tAC!m!ErMhy6t@A|HJn@0v^fQWg%?}^Co zhUjmg_gw&YRG&BS0*_R4CU8nk2?S?0-Kh!N@f`-|3FZA%P~{xCN=xdU24qOV3%_s- zzbg(O`xXpwaNBTi+sj>5`|q(!6wkqQiv<-A)?&3kA*BC5WxZ&<&$lDg4Ex>j{q6CO z#@1^EU@9DPAunLg>`Vx9I3*v~mR=5wdvY^mO_8&5+H}JUE}Jfwj}7+nesvEASrE}z z5bk1Oij{C<(AD^{w;ib`^$f`JN2RK05J z_AT7FuUM7UVZnmHiyXJ$7ro4?ZHn_!#|vyPUu1uo9Xqz|+q(0trrBCIY&%Pq*ePyY5Ax*s zdNXhC{Q19q*``ykZv8s;>f5qy+ur><`0(43bx&qKnX>fi*RyZ${yqHo>ygoChRptb zX8QN@@9%$qH314ZAb|xMNZ>FDCdiC}4Lbk$AcPMdI3a}!4VoiY>bMB8)N0sE&)**r=k7IqJCMHP-m(V}%7yGbE8kPD3AkM0#hcMY0e_cnzFe0CY*7~IcJ=E z&>3eedB(yGpMCntr+9&W$K7_<6`Eaj#$=-?b;c;_D5Sn*q8MgcAruXQ5<2fz4t~zuMtl?5rx0w8gazH1k)RD!Tc(`FvI-*`>?|PN=&cB75B@qzZ5^A zalaL3e6hzNXKb;?6L(zl#~VAWa>FgV{4&fhv%mtqGuwRg%`4z+v(7xP@H5as3q3T^ zKidJ_Km8QaLeWLH@HEs*gu@Tg(Yf*!SgmNiHP@}k_10lwA2t@*SbLQf+DfRcwhnE( zt%FJuoiw-HFXU8EL2~1*6Hhzwy?5Pq?@aJM|P_4EP0@XH?x#7+K__MF9ViQTD%Os+NyEgn)h?`3wS!G8zT=g)b9$K`)k5 zwSOD}Hm`9FZgK;h4Z?;u%=t}hh9kleE}>U@IN=^7*c*JXu!Z>02Ml8d5A+MdLtZH1V<3Hh(L|m8eEls#}7}Rj6teFi|C|S=9;_hsaf~e5Fi16en1D zD2}m+rL1K!t69ym7B-y~t!YU?3gP*uD%VPlf3-X8xSmJx8{(jR7=bBpaE<3d*sQm5iYs1E@ebW-^NTv!WKgsLd2M zGb8M*qciK7&zk=x(xM@uAJ0+RNSy|?ry-%GgfJ;|-f^|8b&YH41Dn{!HWss;Ep2OK z+uPa}Ji5hBc6!U(LZn>j?7+e4Qr8O} z>`iNS;06B@a<>P`LE#DY(VS6?q88>YuX)p}Ui03fz3#;YeB&!$T*R_cs=RM@3Kb|# z6_LN@Ne_CKDBvY7qrl5xkAVve#bxMcNmP8We$F_cFBYhb0qP=#y9h=ve$m1nmarMq zC?Gbrv5j*)F^W;7$2_w5j&#hCI{ql*9|bZ{xOiDM5Reul1!M? zGE}De6spqvOJ5GN zR#(`!ur@1U>T{D~6Lzso#0ZZxzGja zNyGnZT>3&-zW8Y_g_(c85*S2~@dm&l)RNGzE!6GiRLZJY2aALT%LKZ5dIl%O& zmpiF!E_(_%0L){Ky1<5{ds@lb_{_3DwWuPs(}s&!+9z(1}UgQMElV_W}<%dT|q2aRx5Hfy%A=4pIZ1d{npWx;fehcd&ycs9o(M>;c^49``+v zcNF4f4tZ;V-u3dm7Vd5DeC6vX!NYQuR6hK4q&&nhA5j?r9x&wNlipnPy(lq8Dv0CY*6~LS)kUS9i8^o=sCV`B@hPnzjE78Ui{C zpc&w{C|Wlm8lsI$H=RqQIU1u;8U|*dx)6+|&C9~b%S5?TKOs!6HI%KL;L3oE$T$>2 zwIIs88mz@&43?U!m7opY+OBbwN9kZk{S3|=Td)=aM=6t@ADP{B^TnM6_PP2F&u<4hIeAXVV78&jnrxz!a`A%x*r0KJvm zQbRS3X@TWMYHTpaJvmEJs#SNX)|Ou+4&j>U-t#_8L} zQB_z$4+CUC$c-H6v>eS1h4fHXWo=#R+)m7)Tv5o}%(2{6T#eQshGPHdoB;%Y0o*{( z`P^I_#!VeYS-4hFQA7qf&}1bWWB^O^* zUDeqEOgRTSm>oExU2hCS+m+)E$Q?SuUESH;c-39s_1)jy0xrm7;02yB&=-A0O8D)g zeuc+*^cUkjUgQmAdlZ;5P#&pN9_3-)e^3bOgBU7%~ir@hwu5FbR_^pHA+il{6ogRLLbh z36fDCQQismW#5yPlH%!?4}l+d?Bk-aQY>|u`N@(o)ROwKpDzF1lKY)X{H2+dz>2K& zLNCa|t?Wvi^`HO!->?Lr01}`97N7wJS^{=~6f7WKj?)8n6BR^YqIHv9BHB0&rneNP z1|H@)dD^9g8e@uDKZ#nwfZ7eZ49iHAM8(==%3#XK;6p7GXOfyjT}-Z3=44{j&TteD z_L{F1q0opObJziEB3rU88?z0^5BN=lNY3Nz#OI*rQW1~G8IL9=4<~*OMqtnOxM#{ymSz9l&dI$M%oTttUe;A~MOeUM z63Aiz1i%eEXtm)Y(6N>;8kXHuglx?gZ6Te4I>s#ek1|Sz10c;WXut(PV>Awz0S%%8 zjYijboi1j# zoXvqn&gmRlL`H??lwn+GF7jd$*u{KOghhNPh{kBjndpfIKs}t)4lq{+Xn+U2=+zKYlU8zCx5e(y*=YDqS#i|rAN?T9+Gq>o7Iq}G^?4PU0lFEV&4 z{YDa~3R#y(AF39msx}$-^@&n0W#a!iH=e>R(?va>JqC2>y@-w zFCZ(N9n&Fz7p~|5uh7}EHdC;;WwQL40tTA3$|V;J+OtprUUEUXY-^$grd@*T1d6L+ zR^X$dD-Tbaykwd@wJSWu(>_Hez2aKIQs% zo5O}fbI`-YQf#s%A;zi=6Le#5Kw%VqtZ!D~wOwJ!a@*U~fI}pNagLkJR*qBnEFN>5 zyS-b(MdwafKxBO_WXY$yIUE|I=L;}I4V11q!TTVmhIRg#R3VaQHUaeCJ@XGh7zp8_>_gt zIUU?SDA~;Ig@#RH+`wI6atB-h-wq>Sh-fZP=!pUVGdjmTuqbmuW8!l2;=U&&GLY9n z?u~9h2Y7%mJO>DEkmtU$kiv85HV5e@>FLT{>h{3hv2N?Wu6o7pl+G@EVQEwva1Y^b z?(VLph-sO|N0@y|n;Ne~Lv%zN7!)B%e+kL*!sF;`?{}zOoM=6s*=d>BF%684z>L<5+v;}Qo}<3hEl8k zZH`0FnN`ZkC+F}w;`V#zSMi7uEW3Ms4p?STh> z@G?E?Gu;^pmvEn5E4AQd6g-Qzy6^&WYqv(AVDDw38D_bB%VGC$2C@^Sz0(m?COpY& z$Hc43DCVbK@e(gFz-o33+S6vz8mkS|sYMh;>1%1n%oOJL$rM?$cBv@zcJPX=gGEB5_%`>7*$kJ)x#~VeS%>g|FKd9 za(BubAw$L2(i~H4T(}9GQ>CZ7ox}`0G9*WGAiA84CWX{uR>_4e>hM)3J7V@EsAvEd z%QdYjqcZ5^CwKp|GIPK{(+)-2a@J;{VlLY<(td3y>hdll&~4?GVl2j4JVsGN!0=@Iwhiql?Zsi#`AYBml*YbB#LCjYe)o zkN`6{M?b(u4REeJA2~dWZf4Z8J>Rq3?el81uIu`4lUO*EQIbn-@#oa%>zFat<~G>1upNON?YkKRe6^q{UZOSiO3r^xrd(M-ok zP1|%%|DF}`^ra#aO#*fC(SlGDwWMbWB|Q>S@9$D$pP+P~;(0lCAaE<0Usg}$EWJ`! zd-Yep9|Zq@WtPl}ERf{|+lmG+E3@KCArwMf%e6B_tDb#97l^?&{TT{tlM4T}w=AFw z6SiOaCAek_Uq)KHoU3AMpuWWG4_mfn%M%G2F=S5W6x&+MY&HzG;6a7V6EoDnem1y+ zy9&b0J*~Dy?V4)VjA{nW&akGEV@5mNHf~pJ5{}SM4K8!&Lrq~QZ&KlJnhjUPu@>sU za(m|t^l@{J;md;6A|GN?0Zvl6jvuB3A$NCoW7g_e_ue>MB@#qkopB5hfJAps zRsjD9K-EL|+1?gz#iCg>28IJbEmk;%jJdq$Co^2IWBnm03);ziTRi}bbB0w<0V6yufCe6sW4ogMn9N?WaOR8d7Udr?W3Ma zW28o|(d(_WpVQHw%TetO`igg1`@$Ppt!clIJ+MxCsBt!nQC>a(yLp! zV)gnJY}l|;v68h4HS1ZXS*f;l`_?Iop)BMYp*xpuUcGx+tl+D6MPR{$39n%H4{>6} ziR~12{J3xn$&-=PsIdgI63tDVEcTqZRcO(yUX?a|8Z~NGt67IurD|1d*{+(@)~rNF zZXK3u%<%mi#tY%YUyv|4EW69zvy0LM}GbJm+0}oWIq@(P>%rx6hHuh0u(F&K?4;)uRI42 zn2^E(D7^511vO+40SC<^5JCz~1QK9i zJ@(imkAWKn5Fmgdi8OLZ0t~3&h9pFJGKnN^sGx!d3?Lu?00OAM$tS&h@-ua22`1Qp%{J9s08Sm{oKwyOhYTP~0QB5b&mLC%YzGYl9hA^PFL(e>8xd^KKseQ$ z;DSgco%DhYI=Hk05^Ct@PsRGFfre0JkU`W@V~Al?8Bk4C)fnvPG_n6-_M26|9&Ei8 z*BYpG?FVU0c3*jtocmf2>V#pM=kq%{T?X|2U3n{2h+mfLQ(-3DB6 zlNp!Xa?L$=TxF6`M%{JUeV1Kw-*q?LcE>#i-+cAmm*0N(T?XG}1Qv!FW(a0xn1U5v z7~x?Y9;O;;q={JKiY>kv#UL4n(MB; z{(5U#!ls4nvduml?X=Zio9(uNp#_+@<$gPExYL#e@4WTioA3X={pK4MSYjER@WKr@ zd>d}K377H49pA>=$R(eg@@$N`9P`XI-<71(0}SFpxolgEw!XVt173`^2#i+%JN?<{reyP z*s_)a!Ucf|bW2^Bk{6{o@GpDuOI`xg7sxm!AH3?v1vwa*$+Q3om9Y$FmT;Teyn|Q& z(1vJQL7LRO@P({tjc8<3L)&OZH@o4@cVaMu7-*+B@R|Qla;j6r>bS=})uB#(wiBN4 z_@+1D2~P+hRK@bBr#(p&VtnL-9qic0JNVfTX8iM?CD7%9j|Z`30Lbc7%sF@QZG2*GhAnSt^oz)nQM z(wtzm9V6zEqxM7H&A7hx)e$(chFo7aSuFvLi! zS>*~>yW&-_*y$@`y%SmSJeITQSHL~TRZAn$?QkiPDxxG!Pf0OD|{U*4> zT@|abc-&SUm#uK=6RcppoaKx`*3O-kbK}xn>DX#If4LQ3t83lbdQsQe)sAt_|Q=?kE310B%LLU(rhb%A!Eu{uU|>d>~%zVwVWg zWrBQ}UQ!=DG9)&Gf}Amu#Dv_-=qLc zI`Wo{%;cT&w5I?#1DL)jK`}F+0ptG|lRXSbrj2S;o@ZVFQtXKon<}+NOeN<9>PTTe zz*%TRpK1vyBqx5#Y0g^ZN}ZkZM>{DEEO}mfSoPGjvhLYwe1>(O{sic#(PgiH#%o=p ze(0(n3NVQZ1J(mW#=;Vo(T0U|q`4l3G(g(xhvgdB82hQp&|xx_sT^}HvC z*37BZ-kAGb=Gt1i)1mGd0M}RRT&K2Q#BO$Y>jm!inmdR0)pvrGIAQCsyu&giu@`|z zMkexD=~bi)**l5IUjjauST_GACg<$RJA1zK5v3^WGhb1lqT2Y0Hnl@htyR{im9)s# zfK6#_Zg1O_0T$ipKNq^vf!lQ73ip9>xyy0&Vq6I(7rBpNK?=hm-RQPp1s|-;gR!fG z+VF!{`{?d>+5U>~vSPgCtxXefr~@9W_rIqSj^2eMMEbm!Ir&`cu> z`paV{0vN#e5ipN{M4kcn(ZKY1kKZ>>f+o(O(L2D5==l?23BRDih6j=|69mUNMre+1 zEC7;dUwa(Uh{Y4?5R6$|BSukRkRV26A{%5L9~obgB$z>d80{M$vk{X8C^9FHoP^k< zl1dC{a+&pHWmQtCl&1g069JTjduKXx0gF<9j_Bk@BXM$14glsoVzB07x_MAPlJlJF zT;LuZo;{=~QV`EQjAI9Y$qu|J1s0G2_09ucfbWLm0C`0i{;R@Gal;jSoR5box!;WN@y? zrr^pZZ|Z7q9M1m{9kCF4$9I5-AS4d3@_?|GM-vl^6GN_gLgFK&Amk(qB}ifvr|0A{ zOD0rKf7Id$qM*0XA{bYTe{Ac3bPMT{k+y)& zES%06ov!Mvt}dufx%vVy9)k-~s1UragQzQnF5|jPs5Y7*g;>ai+AfCPF79mThH~TX zERek-Fo=pn@u0xgAxfh=EuEbkI8 z^D-|daGW9!A_p=j&B-1%5S?zN11l{A=V=5rtpue-tc*d_SWq(01=Umy24@g60|sDh zu%awV2MfkyPNrf?W(Y+F2tleefvpIQu-K3=30YaikT{7`4a+7Lj+3eChN;@H4d3t$V`1IoklpBztL_jxwPmcdvvbsn4+GH; zyEFd~K_?jqQC|wNUkJ`@5^)XpCgF7F5#v)5gJ&Qtu^^Bq6C2{<9-<4HXX82%B1~~4 zx_~A;P71(>6;bXL7j)%j?tG3Sv~=zk(FZ6Zv=-aK7kLi1i1D@70=5EZ>5A@t{D~{xFDkrQm8Sw@q(xeghnVF&8{}I3sy!09lz`CUZWMrtGwFL z?!4nWVBnj82szx#h*B^0*62q}WIzZI!5GiKA`dV@4?iw)K&9yBTAoRzre^# zL$6l;!y*GuA17e-I^;kAiNF+P_{fZtXfMO?XeB>P_)zjfN>cYUq$NAW0YVZtiBs`pQTJ4l6rh=C zDf$uwN5HI+7UWKjB$1p8R@9*^&5}BNQvX(Lkto0dn&Tn|k1Z3AIry?u=s_=^6)!iy z12ClqQs@^N4_mjiI|dV0`k^qt)i4jUSU@l_7t@{^GX?)}GS`(|WzgR;Q!^GB{(+W+B8KxoIwoo|1 zrZ~;8IM2r0*d{s8=3|vpWY5Mq(G5BY$Ev6ktE_XYyed2AO%Kb;ti-bq$MgRWIcE?@ zCl}ZXU(mCm*b{ABXAu)FaAbku8V(X6F5>Ky;tFedB*H&AQR7NN6bZB@vWF&GkwLds zd?3^)*vEasHYn&vLc`YPV8Z8gix*Ec7>|)GZ0l`nt3;L27fZB%*!C(?RBsXJE|#Ki zqplkNg1I205K>4CZ1hIGkvB3!9BZQ-Tj(5v6uiPKOp25pZ)o(Q2=smf0^^Z566`wW ztG<%e@T&A6%``gF)IRtN^73OK)eB7jZy!nI@+fa1=>rDx<0A8G@mRMvEQ3~hz&}n8 zBiph>BBUb;EG=#1D>q31%0rVxk}G9(B{w7{XQV>v=urP8Q57|M--!Q5A~hak;O-oa zH%^5FGL-=wfB^)6Q!T^-Kvg%EGD4gZRXLUX@@SWwmqT3jRpUffH)MMA6eRs5g=U}w z1myyX={Vr*^7M#UmvRJh$nH>YN=cWR=plvdk}PG(gFm=Us+CuM0d%*BJB~v>U_gVr zm4d+)T*cL$-09NH^;|pcX4w^oSCG}(>U3mqGv)O&Ka*ofb7K0{H20NbjCf>va5N)k zHI1!c4fbHCSYe+KXcX3Amk?qj7G)F$I2Gn%i7H<*He+eQ3`Z7?)v#orQ)Q`>Wm^_< zUKVC$HeJ&yJTK>tyOZAt(Ptm(5YLo-4NE`2;0qukYA3?6 z{xd*hBC@y^leyL>cp|inLVcdVeP9kL$TqcnA}PKWwAS`+<92`YwtkG!MAOzp^R|_X zu^BUT80B_vcR4PgZn#*K8Y8HK6d{G`0C6D$N52sqOQ>=6fmc>&H6#~?)GScuiG%Hl2{wvlMrNp(ieIW>Z}VZdxC%=uIK$X$j)9Didt=*% zaLA@`(%9gbv#HiN-K;8Q+c>M4jv_>HvOdluqJRr-BEU15z;oh3XYoOE@sz(-wJsDX zYEhMK&gX!!Zew{EU+XLY$bgWpwm?)wd+UIBS;X4{>ZGpfU{r#HnJ|c%R}|rxAHy4! znQw1gBv|r+Io$eVYGAMgRiW6z@Q9R%*ZtdV#TjJRV@-STE(O zhfJ$Yi2#uIlEzHL9BHg`Df)sE&}C0iMIeRxVFW0p&Dk-^)g4>-%y8#F;ie{&<3{#H0?Er5$3f?s$XOK*Jhixf9eQP%C?hGxBtCo zo^T3d6S#w0xOI@Yxn_)!o8ddwY(h4xoO?ZiHr((=kfmF1;?TO~5W62oyR$RA!}DCy zO5Zf6Ja=|ydA5)Hg%&6tZKx`}AMyW?>vQ5LuD%`Fkuy$`V9&@2D{e;|?3==ui7S}1E=C6f z5K^cdUfeN~`5SkXN1K2gVdWhl7spj2ym;KlfBepMVFudkbB(;6G3D7610JvlOO>w| zGKlXNBOdf%@Tn9GRRPw61WqNrG#7aFL()&*Gt^-R;#y5G%zZaqOAJ8!(BsQYeNhr% z)SEvft=D^hA%*q;QYhuE=R^PXjyFAQz3k5GuFu@_ME8Qf+%xEb&jLGA&d>c}AcbJT z{m+l`K;%RU|DnP|oqDPNW14kJ=h;US`g$x_ss&y-(#EBDeS+r;@qsEOK zjV1dCGNj0nBujoghB9T!Vk}#_d|B*ROqDci9$SWUnJ{6@kTLrSG^kK!!FynFlpoh`WV;lzs@KaSjZM~x;yF8BCcBTJAl zXUeomlh&`(v0e8%1U|g@@rMeTKabvgp7re4*Qs;o{d+O=>)Y>wKfiwbT)0Gu;$MGU zQ1M@Z22$alfeJ3jV1o`m2;qZAOh{oA6&o=WVgL=%2C zvCA&R4C+duuC)JxD59*e@=BwQJ_>21jV{VcEA^y_X{MTP`p+;hyZ|Z*puRvtsils9 z>IfaI%4)0ha0(9vvQm&i2CI(n3#Ynb3J(mdqRMKm8OX}O4*cwj?3v8KU}~zVwrcCD zv<^$_ta|9m4+$NZTIvq3CJU}QBrw1L1>~B`fC300P=Eje1ORWm0k~U0y#=hBz`6|V zDuTQI${Vi$^(J8J3o+DyFv2q|%rL@)^aF0P>cB9;0t%?>E&v*D%rO7~5OBZ&3Xn@O z1NqXsE&>T8ut3ZCvg>cm{@N?E%m^gg!2}Onu=52P)T)67+yYDOtRz!lfdx9~(5Ih# zE)DgkBZ&X{g0rozst&RpT)_1O6MPMJ*kVrr1G2DOjCR^;udTq>-*Vc|tiRr>Dyk%; zDuM_w;D7_vOA7>e;DHlVP(lbbgg8VLEgsQDj$;&^N6k%6Id&_dR9)uQS)S4|DB-k| zFgP7X`cGp~g;Y~aedU!_uD@;->$1pQfBRTM zHO74NC{+f1^pa@?+Ge2PmRa?vZO?u8w5--$_}$f(TlwYJ63arrtPeV#G@9e=tVMu(v5P+ zLm~ZeNJIisj&>A8A{}vuMgpP|b9f{h`Or#Iq@oqC=%gxjNsC|tlbE`Qgk*6cPGl_O z3h0DJJ0Ss2d0GOWn)W9{tzwReQq-a(g-1zIN*fXDBc|@LgHZ{RR6_&Ss%mw}4!kW> zv6|JiV6aF(YDy2Oy4xXZB`a7+a##GIMNnJoo|00wO91qoBw3}A3f7{I^|kz8e_^l-5Q^fCY)>)8Li z3LvtPor_%Ss#nTZ*0Ke>tX(y;S1)TevmPJ|9$$Mv2D%nB4Rl~?%?f4F99gcU-2jeG z+mqjv2~a{lD_DBqhd~d@k9;U}p*0wrLn{`}i+x>4yq^4|d2CII z^xjID%s{3y)T68Q?5aKQ>2uYPw2UyQ6Bz=ivpJ9D7zr-rm7{X!faPa>p63OK+ zvii%PWcLT1Vu*w#kl9>NxhK9}d`E!_EJS%4sGbKx5I*ve&jr6A2K>Y}gBuJGfB;0G z+m>**yzMOtCxpV^%8)}Gq9F`B6rvY~C_^Gj?vg5m!xjbcLn)eK6nB_JAN}x%N$Rc< ziKxUTE)h!M#iDu7i{2|yiHluq@0P@rtag}jzHUNeo$ka&H}dIEev%^{6GbUT<#E81 zYK1?Xxyd~YGE{|B)g@g8D~_5H!IQMwB}vds3ZrQcq5NpHF3C|xmQq*!Q06gra1RaZ ziXMUFRt9EC&R^nEm*jdSzq;v5c?nDb6e!ifin%a=?jUO_-qbP_AkF_;R+D4b44KHz zC99XE3|}l;8O;9WE+;1$oiT$4vh<)cclzuC83-CG?>2&aa#U&i^wTQ-^t68hlv#$n zq_B$i&^#{yY%NpUM0Hisi?S`7NLGNCNzAqhggC?=m6b?M+P9QKjirKf=}TeikjBvz zayHee{errZpH?TRp1Vm-L?^nVA~mT~WgS#s-PBggx+_%`i&k^TyRhn7E@0g?Sp%aE zvzE0QfH{g$s!=+&w)HV^ZFXhKch}AAb=rFMtF;3gScVW5afj{p`xFcAa66VG*@$dN zE^ArK^3ORN;cR38*xAQ?7PJT?Eoo7kTGhG-J{7zmePBCV+SdPe;QjF}gG6X>-)0Cy zFr*>Fk-Ng=I(J0HUG9Zun8W{+H%HZNqLPrL0|gX_r7*&;~V+g1plt0jsYg{fLX!EBKPqZgFN#kgf-Oc~dYj zS-#Gx<6vfhYQ?NUGGVZXwrh$W7KrhZH+Ic>WwTtwvhtKyhWRVI>thw@eCHc*PIML^ zSsBn7(Bi29dKOa6qg2|SnlMK=D?!prQzn}0d}nGYI?w-K3uo^qAn3hsD$s&1ent^p z{Irq1^+>Y-Kt(`%N>|#_hr@I&Y=M1SSVa34afvZl!VyoKBqcm0pr}Xf*_sR$bfO!b zst;3`Sx2R*u!f!d?=O{FU$rc^UW>2)ziWUIY{Eu>gmF~LrfkgSY|e&lc13O7V?f@s z8k%8ku+f0o#u=FAZQT}b9oT^xkqziZ5|>p!=hklSHW>iqR*+#6v~Ua&h#D1WZ}x_7 z`bI%F$XfpPZ({HT8I&IcCm;zYgdjvB5Yj@xr6Iqya26Ls%H<)-B_c1RgduW6CX!q_ zR3l1MAky_DQj~?)rE(d@OcKnWda}q$f6E9 zLuNh`PiJ;2qQp`8gpEz}X8lBaI$(QGXJ@h^HZ3zY7IQK9SbV~#Da4n27IkQF^N-0# zE)zg`ttV0zAOa{QY0}qH)Q334un^dHecAtqeLm$8Eg^m&aSY`bROgpDpw>C3=6>&Y z7^o8#N+o|(QGfP_e=qqIWRW~-kyZT%fH%n()({suS%5uh4JL^gK7oLav4RV@fVXj1 zNSRj;$dsd@8mv))u5p2YWqs=Zvd2W;C5zTfCl7Su7 z=2ze`S~Dmfrqw|DwjMW#gLU9<0Ox}mG;l-cmj(x1#$_P|vV<%Iafj)I6qiEI1tK#- zBN~@+ECQKj=y7CNnPMnJDmO%!S#oRWnNz|gQldp|_=aJ^0$&6O;L;CuaEEcy0%x>y zYP3dr(uZ;63V;}hb~K2D*eLpNjL82INDPKb7WQD1_zzTfb-yVt4z>foi6$fvVkIM; z2blqvxGDW0iuvH2X@U-@c#i1;Gq4y;6c7T$2v9Y!D?4yV46p#Y_=*CP02DAa!Dvj! zlq=hbCOz;jkLNMCgiVuokbWnPmPbyTM*tO&1fn1cNq~(N&;SHbpfRIPyV3&>ursJ< zW=@x8tcNbmcLPa~1pM_zv=@)Kr)FUjPARI719>qdfGqxqHd+=~D z1lggEmNa=2X({E9fJ1!-(GU_@3&dcNw%}9$<3Ij0IU)&EAo)|Ewtl0t3_v*)!w`Qj z89OcMIxs1wNuhr=*?(yf7rp<3lWQ7mzvh!Zd4NGVl!}28$nZQyiKkP^8BLiPFvzD9 z7?rX>K6;uPRcV!1*&EsLZCc5w^fPXZ6%yNEKg=;%VJR6O;cT3v9ezrIQ0X19@g1TC zmkU&bHfWa=L?3scgFWbjwWV8s39BX4LJ!A6gNc~Ub(k?Ut3?Q0MlzT}QXn^?ahq90 zXJq)WnRq6f$T7 zW#%GI(wH)#_bvo*1ER1Bs<5C90DC}$zsim1M6#Qb0q#_07;28F!lA^%0Q&TyB077s zCuz2aX2Eiz5v2f9o1|$(D+#8rGp3DuJ70NvzZL ztmCz;Q)FG!>c34AnxyGPU!*1B&`0dx1=`vsd8mhX(nk8lPeB*1|J4fQN-0KHDG0_7 z^Z*z1kPrF_E(#_{g>-vYBd-)Np~%t?_W%#h01x(XEPkX8Q5!TeGU5$2ofg4~kAP%qjFB zEEp;@s>g^SFiO)YQcUwkjoh>)$|~uYqE$O+E&8G}+O?V7wO?DrHJY_?9HWIcwv?PU z2ibf-+O|u>14CM*qYx;8Vz+>+IhaGsmm?FhENUY8Iag{_hI>0o;ia(V3$NC=FFBKu zE4h_RxjcEf1h~1J>kL8>%|S7g$MCrdIK0?58B3ad7ic|twYrJ zyNGqW?K~Xn7J}kOsrECxET|GLm=dOIyrSV(v*6FOki3V02+Io|bLqUNYL_}lz1Q29 z+1tGj?I5%Nx^Ul1tGQ~v7TuWP+d@;)LO!%2lKF*|$wWGWT{uG0B{zoOwX9yKUH|LS zR^*0p*j`*9N$day3e3PQphgJ8hY>8nxS5+4EMRzaM+X)$`mhYU-~_X`u7d;vOVA5* z7%}u9oDDWL12qEjn#G&K54tb|V;3zWfOut`EHgmXni3DXumeFH0()@Qy8;ihq)li0 zujHvJM2smboGi?6uV=e5LJR{t@C$$(F~dMA9cD3_R{#+Eu~&@6={YJH`(l3=i?jFw z3^R=P2`==o2P9C+(S!gZ01Gt?F7_Y*k4G>68OKn@p5j!;nr8s9-2i#KD5}7q+Gqd- zAT#^_vMa(c$f#$Ir}9ep^skG|$c{{+bVjuIB-d3dGGxoOA#=5WrpeX4$r|O!*4?!; z8cn49*+(N%e3Qy=3%Atw%ID3bcZv=deJH_VJ% z%rJ>NlIwrUyv)sPJkN~a&#Y>mn;4*5&$*C&kfF`oY>|K^ZA)3YtowrdOl?t_l<3?U zv&#_c%o~d8&Lo$TTD3&_)Zt(V2^45ag(^sP9&*A~l3ADTeJ2j^i3=#d8w zWU8mC(DbpF0@4Ks2hrU-(Y$IPi+R!Ki>rnSzKm%j$>o?b!XhvNnfz!+I;}i%_)2T!0_75 z$$3qq5zp}6ZBgfvkni}m;1P*`(URDV%^wUf_o(sBZ`QQ>R;S|24vCz#Hjv5;-&f2lz`s})| z+Z`Z&8zRnaB)%Ic4)!4kyue$jB>}v{>sHypS2ZqLy)X*|t>Zi{_lOYW4CK7ei_k~D z&_B53*DD3uYgv{Tm*hVbY4bxE}OHd=Ml{3aVtf7Q zTIVdrN$HrrXpX3QuHHw>l6(1HF6q*VDNLbdE5`sU>?45uHoOGd!mtW}d3aarr82Rh zs7m0H4=*4sz^99`=!+j~ViXJ6FQDwc-c7+iOrtUbgv}|xzyOjbqlFeS08v0d0D=J= zIQy4S;X;O^06c^kKtKVC6%QOxz(6Af1`8G>NPs|O#R3&7+(3CFi6~X9T(VLnD#?us z4GajtDF7Bjo(Xqo(2xNrP!c3Yj4)dCXb7ehIBJB-K*3Z77OalYkyWeK9bL7;fMIlL z2&Yk{PDMNQ;##(C-L56kljokdb?d^DyRe^KzHQa6O&eJ7;J_FEsZy|-SOg9nTXpov z+C%bW%A+h_#=J}O=3<>ae+C^|bmwEEO`k4yO!aEkte3rp{hHY_X0>hK#*Mq$Zr;45 z{RSRf`0ruBhaE?rTsd-I!+bSgK3w{A>ea1F@4Xw{_G;X_ZwDWKyE^ja&7Vh~Uj6#= z*4$fD_g?;d`tqGwbCzHK{{6XaBLgr%0R?RBm|PA-FhK8GD#(uWU@&opIp+IY?7g}N-M9d(imf~_#AOnn`%! zD3&+oM+B0rcB`U+2zn?09NunO1c)-nY4QRvQeXj%Jo+dkk_0%w0+l@WxFw5KiD{+^ z3?LwMyfy|3=%Ii@N@kmxBFikOqjt)IqhN3>E3du^ON0@avf%0C)9NdGxLT%5d%Je8 zcQ5bj`U^0_NGF{z_0dm1dBsEktNF+%qrV6L%aGPaip;v3M%J0Q>B=|rMcJMmB`Hpx*C?0j7gFPoiVG83@9~QQd zKK$ViGxAd#WhkRI$f#ir2Na-V@US&t0wRJeG(;j=C>9#Jk(rJmq7wb$L?e2likN67 zDuM_{SHxl#f3(Fd7RifWgi;vAIL0t)2}@h*QZmq(#xx$N7(o=%fe6T&DzXSoFY1Mw z*z_hg$*E3x0;Hby#D_isDo}(X6rvP)2Sz#SQIwKYr7&fwQdQEDm%OB^LglJgp{iD_ zqE#r170OwE|=3e2G6c z_70CF!JQ$~%HD{k6r{{kW%+2?3t~o3o6U@7H;d*!_TV#uYAt9=8(Keq5m1-y;Gg{z zThp9oJgD>_X9uvz0T7Trs5s@HT?^hY}bI?O{8V?2#W9jXr=+8L3DZ{uu55?5}3RpW_iq$pJQ+!0=`Z!u1`4& zS~Mz>@zo_R8|z+S+XBA4@I$eRRRBf|qdv;2udePJfmOEB7{}DFGWUZ;{&vAX&G1iv zrv+eXJTpf!AuxdpWT0*u=)nnQ(6-Bg4h3nuTiynzH|Wrgc1B1-6ROa-$8}+HlM6%U z&d`R>)u9e|hztS-5r{>^Zg#Ioi(Ig1i6T;s6IWBB6iKm;EXrbf)yp9ranZfC_+osA zL`M47cZ^y>qZzZbMmF}>OV$n3m{_Zt^M(jbZSsX4_t+*o#c39Q45T0l*(X2w36U3G zq@ftqNHIVXQk&9L6r>>k1yNBFlP5;;sz#McP~wV}q$K67KB+2L`AS!)D%PyVB}-Vs z(o@s2B`<>+EogO1T1MX1Fps%QCR2-A)+MpX<$LJkqjW^1uE4i<6yv8qjtb> zbrVUf^HyrcF&YLs6`Z3faJY&jZUQ~az^ymt45SJqCP6`r$sS*SMF0Gg6oSGA> zUix$%(dt$$M}P|dconQJc}2Kg(h8Z-1a|^pK+Bl1feQ#l15HaPL`9GotIRd9he3?; z;)h7n7PM_|bxvE}fT!ofCE;;}o3L_A{FG1Oh}7D&9|ZQ>LQ9HRA>U5oE^uYA>R zU$(csN&NM1+_^;cF@>o>c3arom^xo7vK0#E=QGfHqBtzLCgR0a={Q5vN4kxViH4hn$^q- zeQazMaE3EVbfCO`#=EUBBLTGKvIO))v}O;Tbjx4?>_HQhq=hD_+=R+$#0Jk~DD$UB zgNncqHhaN=(3zY|I~%PT8vaA9kt&P87&Wa40i+-q^vk&TtCxYA3ZM!qO%t91%nOHd zG@zjyZKH^(n1ElS0A|>jcwhjGGB$!hHf3A3sRA7Yu!oI-hh~!q1f&QB?1-$gn{B%R zmXIC)ixD@MP=&F|9S7hZc5Anw=_jVhEP6`};}HzZ+BfIXfgR8*#^9@YtDb>Ni&%>| zwm`TIOhbli8DW6KIF!RVq{BM2!#jjS3XnL-vN(!sAG^9MylS4V*ny6d4A2s}kyAv| z>L1f8Ig}d>m0LLkdbvuREt;c_o72SP$Svilt(^l!>-a6<3ZdZ|x>GzMqpJ_3Q@U1k zx>tlnAG$lb`;x1(#Uk1|1X&RRf}-#Oue~EXvlGS}LA&=-JNa_EWK>4Dvl3>MJ1n6^ z0~s(6(K}#_5n0$HH(8VC*v398yuwpF#Ums>D1<#JgvN6`McS}NiM+|HJj(+W6WhH1 zdCVlw13k~Xu~E7)7^AUM5*E@^6<~RlY7v%O0TykkC2|2KBO5Z|;}&kgJtuR>+Y^`G z`@Lg2zKlG+LQuYFqK9y(gXkNWZlb>GyFTn|1yxAN?PGsJpjP+yGfhTzcTxwT)Up zgwlg((uJkz8J`jiQnM$1vYCvlN_)A7vp_*>6DspVij9FO0jwL6xU?0VfER$A5Qwa$ zx}0SLOw7SS&?x{5;GBBF0U!K9i%>uX0Eui99d7fsBn+#VBr5^HftIm@3*gNEgR(;6 z!9pyYtBk-jkFr3114FHV3>{#MeTJaRfyC61#A9%+N_@Ena-iYZ#PK{1 z48ox32*vc2hH@AVQUorb1CJ6y#rZ@J<+_ifvyc14k5+^sSoF^tQVr@-4Ju&`S`?yN zyu~BJ#aQ?duA_wk`#LBxuL5JxVYJX1DaN!r#%!3cAW_B-g_3P}yDWLe5{<^~Brt0P z23nW}V93S`0zAJXyl)gFJrT!2;)6Ws6Lidj#}k7)FoQ<=0uSqgckGn^%%jI76_w75 z6@PTn(R(p|($aRu;8iSe7sh_cD|8>&4k3OVfwT|k*c z9jbT>O1XF$p*hM-P0FXRhNB4!m^rlzj7pLkz~96uUD%kbtUI9 z0?15z=|QI|2n38Zw1~B~j5Th19VDd8m#Cc^xJ(^rnH}KFDFmATTn)|8q^Pt|oaI5y z)buykjH}TE*Nqw-(NV10M4C3t%{fKbgcyPBG1WfA9=bBl5m+f5NY3SCPUw_QSkMJt zm`>~TSVv4PNn8f*>`w1=x!IBq@>JOhQqPuc&jtc6;Q~7PJVp304^_-h{?u7#_)n)3 z&;bS70Y#8x05AkKTJ4I3FG0~Jn$Rk`(5H=s3^m4M1S1f&TKd`sEXmpuWg`P!kU2Up zU|3OF5ZkeJ(H6a+w2jei96TD0up6B)#mfUgK*tP26v!J=ceFetRnop?m0-~%DZNsA z#K+K^F%_c~)Eh_}`_fbbmRMrFE=8su1HOi&NZ`vQBqP)RHRW83B(ih)+&2~798120 z&6z9HgD;ytJsq=?#J;bB-PjG(yzmD?O^F+zH-C~;o21E;NlUp9hNM7L-gT==?TH>R zv`jtLq>PGJ-I(C5HIxZe;nB4SG*ybo)_Q@38U(@uz&8r8sG}JHyu`~6tkt}!K&8ml z^$mdzK-G<5hF=ZB#4)IUBAyZ0m>DQaQ2Pi3IJUc)iVWD8Ux3zVt=0qP)|_Zo#8k}1 zoZoQ0o2(=(12~CtrJZwX!kWmP@U@p3c-Nqj*LkHkEri&i**8LLp4Q~oGAvcKAS@Zo zsDb4kgEie6R)~c)AHEn2;dI!`>L<0CSgt6ON?bwf{&PR+ym1DVm9=8sa@q96M4Ic4?1O&S(}Ox#rJ zM_wVl*b7K4706pEm(QIgYuQ{TJLb++=4GB-G!0XQ99<~`11huOmT3nd05fe4r*Z0LZ~iKcsh4*cXL82EkwPeRzDW{r!Fq|CPpfC2jOTVeD0C+1`ZL3{ zAlRNzhnqUJ44+A;fS#t{1~7?ki(Qxy zYO+G|dhvkHOls;`YO8Pn3-H&pP`~)*i5@UGu4cnDJXkajsIZ1CQ)P?bG;0Ou8Mw?i zAZD8yAjE^23??XIBL=y+HuR01YwQFKC%$XE&gZPeCvCJB<&=2}Ls zyD*VODw^a-uI*#DWH-s}7~SMNiQ7JT_8sNX3=2{Y%Ueo$$0A*B=1#FI{k&PGWl-8~ zT-hX9(Pc}@QdCKnU?T-_jza2^|rk+ZSQ3QgK+q9I9CXI&;=!6g6eC6 zGQ;ouhFy>8zIq`Baz=>?ptrZgRH2cm-8~9)VCQ?rzeH6Uc~*#gsOJIaco)Anz@Px` z>6?@fXaIyjGekj(==X&OH2)-MR+SGwdaY@@4d$6>#CMX=Y z7l%@C22dRy&v~9Gww4x5A|K2joav3hfhD(Athb!*)ylkKfSx7*1HhfKKSJ1bi7Y1o zUT7H%@N$cWt1!0!2e5k!Xn?$rLE=<^Gxzs|Q1i!PbKCUlzgIpBXhX@GtgGQ+_3^1q z9U4YcHL#cg=lS#hCC~#s7<587bVE;c(<%*-Wx3ga;wat?W;p%qh@c3fblMJV^E}VN z=5*egVxQ|`_$)3_M=lrAPgCDnR9|DMgU0^?B3v+j3TgEQN&Z*Ax;mEi)i|$OFS}bO z?b7zpUB`YZnG#=*yIgo%K2r&vog99r@K{)V96pkIAa0D3= zBtnEwjEF=jawW@_E?>foDRU-GnI&(kBpDMY&z?Si0u5TSPP%_ak0MQ~bSYD&_M9kb zB6VsLS5{a5Va>Wq6xXg?-_;8%c5J;SH_oE1P{9IQ3KTlH%^-Jf2e}>Y;>CNfsnK6| z=emuXq3+-e6f)4`YZTU8yMy!Ml^d7=Wd)WGV8)Cn?ym z`EuuOLvY?;sH?NOtSI>G~^k3TkL!Hz@j7@c&NO=p>s(Jk5JlFmVfnv^4u5L#$8V7bE% zODv&>9(#aEh?slmQf8UFpqZwcY5r2oFUPUGGGLxsCd-B;QGu2e{XP$r( zTFo$rBATe8hXS)GqQEp7sV|dKTB)OlN|ULkn{wKzr=Nn#X*tpq3Me|IR)dbJtFp?f zI_g;Ss;slpTC1(H#`aMBB@ z$}6+nGNiuD67wvS%3O2Jh~S*F&O7tbbI*qGVTjN}6P<_AN8gdO(o2icw9{XF(S_7g zb5V5{Rafnh)?0Jkwbx%4w2(z&JETxT4^5>_O7g%GXKX%s$ zoc#h==+3Q1!Qy=FFnW}cNj901xWxurK8o>E}^~L$d9c#^PkD!hW2-gGlzqQ6a1>h;>*$gwp5CaKyo#(u6wKdhld$Q^F zAAbAqFJJxvOpht}&>w&TWI+GPhDHoxPz4?Yp$V}<6iK*{0b0bn4$UP59}-cBO60*4 zHDE?cvS8yHCnF-&=ti8$5ekQ-yb{7tI6`V64O{4>8#-wMIt<-i-jWw7fd&Rxs)3fc z)Fm&0X%AvD6BE~jreFMm7f^)ayXbT$Jozb$enJ(XhC!%Hfia9KLsX^8_^3sNDvfGf zW2Xpps#3Koj;q4et?FpUTjfeuu=*9SoWZMP0Wy%mauy+#v9V)NOIp?cqE@zWk&A9Y zGLpDJ7bPocNn2>Eikg%Yz2w!ePl7U(1REtO0j981BFti{TqP@8X^dpNl4G)*rN%&J z%W55?S|l4;$xKGFUn0Y0!W1UV$~dW*9rI>8(^(&M<};uPEoej&8X%5l&81<}X-$Kg z7@{_{t6?piT!_Lr<7Uoto^xyyvB*Uha*>C~t!-vwCp;;Fl8k(fa2c6f-{{uQe*!e1 z0W}HWaFUY4A=Ge307N-<7eg2ILl}~qXcM-Am9A(mqnP7dTGRrf)v=CrvfBgd4g*q< zzK$vVXbfZ^Q@iIJFL$tk%?p`AkMUFq2Et3t2#8la<=n1$1>g_=UzkA|=EdfJ(3?#F z>vur^>Q@<~;{s2I{b<9m|xjIq2id5@s;O8nBN9=1G9_9Kaa{9A`iT zhJDp0vGRj86< ztE{1_JEAwed-T zlnP#OEC6PUQbO32s61sWD{SElL+fDm-S8}L2{Jg1%$L9fCM|vmj9?Bk#lS#j8D*AC zn=LbEeQ0Jg5zz;qNpqUeGz1{3c{Ds=Gn?A%<~PB~1*(OUoaIC(lbhVOc0zfcUuy{3 zx^~a4c_hml3CWiENt3$?G|XZibKeL`5|t!0%|GEnA=1&0(>CQD6rHnFG^#m{p2edg z>dr|8BT^W=SuwwuOju8v(xs?_F2ieS>tK2r+|AS)ih&1CrDVFitR}3kiK%Z8prN7~ zrZTwsA8%ySRHoeZsRzss0x(-uO&e)81SpUWIAah0uew^(=i`hWhDZY%)IbI?@IVF@ zz*gOyIw|nz4gS<4pS?ocuTLdv{r1{dY3s*8ffXzP9FznJQ3$aOC@oVQ8v+VMwu6&( z00={fQOQ-0SmU`LS2=jqiM!#o=o~>y^1MhJKkY$)^Lj76GPYF^Yl7kP*0w2#&?P z80__ZeJjFZm+*useBraBJz~<@#?jl}F%M_|E0-gl`-n?yVil*D#l<{1%wWt+oYk1d zIR2TAhZcyV9o}d_4sz0l3^i{S*~sE_GUdBQ&$mtFZ0;l*JlQ!Cx8>6#Tca}A{7L51 zKY+K23=bEmqvGQNi*HPr1|2Eopzw7g&BYGHm&{b!{*aXVTNQ{gS=GpCfP}G zhN|nI?F23}1F&1W8NiXSNbYe) z58RNexfZ@Pg}x!lySb2X^g|KygAwvW5*8s6CSemgVG}MP6!wD?8sQT51HcK~Y8eS@ z72FLW9Bu6oT=ZjA{cFp(};TyV`vog72Pb(|J)QOH$;G?3gLs?2qz zoTZ@A%L!tr+@YzM3eK@gukhR=>dMdk+|WT{(HWB4MN73f9n(48({&5ENZr(V;<{8_ zE>vAHWL>)$*fAhj*L~e8+RNCvVl9-N!ld0S(qcBO9VOzTwOk9_g$&*K;@#n0-s#=U z7!xun(=yH2jM*5DMbnPu7#~#sQy}zM9wgr41=)~wlNdyvOLab9g zRhc`z6GLd(M}WV&K4l zC`bdS1pypDYghnh5CWGZpaKdT3!+B>7$j5lfPN6jZeU;s^3PoPq*2&|S=NVL(Fg^2 zP6coqVMT}pp&+&K1q{sp#S5|pi9o<#wi^wKkP70UQs`h8I*AW51q(Ha4Gy7V^g|X( z=44VPk|3rReqm-#zy@pp8GgnKoYj_a$-^O060xC~NKwTJ!)nG!#%Wv~dK{sEoELS` z9*WVUm>l0x${()WAo}K~6rv%X3L>Hdd+`b*;t{SmqI*GNBo6= zbs{Hbrze6-D2k$Yl42>o%hs_XE54#D#$qbf;(B6OGO!)nWmt5&9WRcIF8$&!24gVl z<}vl1F~(RjDkCBg-ZK@RAq2vKQsa*?UgJ3) z*XRV6X~afwjY!1*Q$5N=-P8@2ndnNSXiV%QNKk?5v0jYQsEhXFjk1JE0OXDuf$ibm zX6XY|G~|#HDUm{CM6yK%pxae7NujOI4hX|nq7Fw|B%isCVlakXjO6OT+DUSspoL#g z^^kXj8cd?!OwHs>GJs94-w0@sc~HjtDV2PrrBUEOP^wyiXq%HDCH~YOFK`A>$_D{d zfDPP05?I9zj38!FfK_5;R{oj{lz;|2KmrgTQ`{+3%_&=Upa^gVr(zpmg`fzI-~v@Z z5^x1#B^I0V#SBOWU;5==LO=t|YG5`%4N3=L7A8_0<_#@?Yrz1HAm(H8MPyRuu_CK# zZDEpJ=91|DkZfrtXLhD%g60qz(Grj*Z=EJ;s-`eNkucZ^xMC4(_DOIKgC5%E$N|HC zTFS~H%5TCer`(~<-Q3M3VsRR$&LL;5Ea!VQXR;`RvCJ2A;^K5-Vs&bwf8jzc+=6yK z7D1zd;h^M>EOD>gXdD=pQohK>X!Y#mJdKwISlB~sOn8L^>C0fhJAOkOH%YEW! ze&QY95o3SW%rhXPjR7dmFk_Ap&4B`K;^o1DGN?8^-Zp;I(=lQ>q{J9!N~ zIs}(dEt9dRh*s@OwCLT$Q`UAw6uf9Y;!TX^BaNEv*pe-dvaL?=C_pL%5)=YDNGXuO zLy_YDt&!qcWHHBUb>s-_04%6O-7+7QT4eNL>G9RYOJ0>p#?+FiBvbf>_+cNRdFh#| zDP^$gQZNGv;AHm6=>gU0KRAE^&1rzNlT4rsd!PkLf3S$YrAUy zSGB^qod>KDR3-N$|`xCjiylFN6l%Xc0_ z)m3bqq+-VQ%f{-Sjx7YE$!0F@)FF>oy_JZyWVWh zNW$OgY>f>b(GZ@225o}o0UlT*(_kaiMBb4hSvQUo(>CoNvrRch?bA};)t(cH5=4iF zZI@YXOK1%hbdA}rgxZQk+SX|5p>5h$vL^2%K1#AnP;%S89!k6|?THN%Ab}TzgF`XS zF68Zy>Od^Z@(t(!TJSAvbRh%4K;SY1JrJ&sG@s#`k6U~sQe>&>l;m=7ga!MMrJ#0(o!tszn22WDXw221!<|t}pw7 zkaXasKOaR8Xy!&ET>oO}|2k&BC55pPa7mkVjkJ~lJ1a+TrnGkEXU4!;Ij|i-aBnfu z6nX1vQt$;cgD_-pxiZ%mJ(mYZR|vCQcD-u}$Lpy$S8%S1y;?&x_?&Vcr+Vd4zxt~T z18mXRaMDdDx8$%6BP30og=F2oBeCYTbhqSQhE@hF+XzfkcN z^L4}+%qwLvd~$KyIZL**>=%cz7{e?X4-=)V>&d~GBuI9Q?MyR0(`5@yAn-vP&+*U_ z?HxO)9!m{`_OTxW@@d!8+BjKmy4D^65 zSOfi>Rxk@Q^cC|_z=H8L?(?};%L0q_?h(v(;%IZW@bY|#4^b&aw>_L$u`7a-Z z9HyL4xIfCs!l`RLL>~$ zGr}=~{#YFg+0)>09$O7*qc(+xyN414=?#RrkGt4HGDkqN*Wh-$55#X5_a=KXaNGO6 z&!{95cPKA6-x!p0KQ~XD@^nu(mxu$9*uyJt_h^iO1&BBY*^ZKoKo1CmdE+2@r*~_t z_hJ}d#+zUMz3)-bH#9?s0?btO4lZcN4IYs0Ds&r`DR2nXK;E<9V1(Qzzhv?9k zyEKPvzy;KRaKOU+g7g-OG*XZ>mP5V(8;NCZc^5W$;4840e@6S@mT2nMmqakded`4u ziZBdAoG%xu9LiAF`J$MSZc(rqrtnk5}%mFuuAMqU#YO8oDDgda_Kq zGekP1D}SU{`VC|H!HRVxk@Z<~I>3NBT63qwhG)f+y1i7Ls`CrD#6qjP`oO^Y`KM<# zR57j7x_ja}E*cWA_xi5eXRizU{R1Ph_u;Z5`>`)OK+F<2>lwjk&m>7gw2&b~g$?^G z;@ZkA4@{X92V!nv~LD_|6OO{-^aFIDvW)zz@apu&yQ|A$$ zKY9A}36v<&Cq(#7Xx2A_07H8Y9Z^zcXyLI8yzbIsY%|Jo%;=~mo zP+ov}bL9wH2M-Z~8ER(JGh`oL96C=x-zaQ#<04i9el~!JPr4?-u98f|3|6I{V!2unFFhPC%tI)y=D|AM_`SJ^3!~E63Mw#wfEQu3KnWcx$V`L^?|C4*3`PiH1QJLPK}ZoCh#&$8AZS3z zC7EpUfG44h5=zgYRKPRiu*8yq1^m-vgD=6{po1{K^dQU{DuiW%H5bUzO*fx}$G?6Q zkkZaO@yt`tJ^Ad@&p+*a)3^f!RbWj+*GyDVGCSzNgBKuup@vCo5X@3L^w49EO$i}H z7hQVk<(E-~Db>_rP#uODRhenk)mLFn`ez=xfYN^=bT5QQ! zqmfQp>7|)&+G(W!-6k2J1FqWYtE*NyQ9vgq%QILafBkU}D9B$XIP>5DI1ib*EPVX7$# zE|SVz^UXQ$-18`oiXtojovadlE2>UUUG>#jXNs+}z;cT$*k!NXcDdrpOZVOD;;S#f z{<3tid@!WvvEw6?tg_2A+l;dvoWW4~3V|CAw%dmDY_`*2!R`9oc=IfK+!*l9wCa&7 z?#|_!bM8FxryHTV)2`dGv(}PxFFXLo`wfBhc9Q`8d1yoMq0e{l(;)-q=N|qUzzqge zpaLmKf(G)BgDRN82km2e9rWO7G$fz>ZO8xv5Fw17!~hnZC`Bt`5sY9|fyh_@2Q{>i z1}?Ax4R`=ZBq+gTf+VCOA*o44T#^Bzgv34-$~Y6CK$pPeC=X1LidC#4n*5_CMIDNX zS&|cK=maP+j**Q2Wi(@;2-U?xZE=fa`jQkQ1*sWOY6q6el%_WIDNu#VRDBc%u3{Cd zYP9NF!>Got5Shqd`HEP>LRBM$H4JD?l9H8FR;{XaEo^N|Thf}NAXAyiQkKkO7Ncdf znAtOBW{a0~Y-iQ9CeM8Kv!QJhXhqw`)4&-{ae|X-QllEbqy|fMu5)Yc?Akk(F}8T7 zjh^)^+uQJ&&tA=qpK+@jLhzOlfew^!3i;bX0e4WsbtG|#Q(WU77g5MXj&e1b$>lKj zxt;7qqaF4C=uSfCl+)oPDyf@F>rl$NDNLbtv!mTt#v+!sSjBcVl^ySJno}eA?svco zjPL}rJqsQ0G0B_E@-U+r81P~=AFNP6ntDFlOqHrt6>4c}Gd}Rerm9rc4h76t8eXsl zOHo3=0os>V=A0)z((%#!Ov4P}bY?sG^UnVIXBt>QCpvQ-j{XWL!VcwUfdN2ZJp9vu zBoHWrjcvsR8>>MAanPxi{opqOJ0AloAr&_;VFM!200T4tN-Ja`if-US7s2oV$xEI+ zDzt+QaA1lch{0`VFoVh9KuAVHQj!`##3CAixKAoBoh@~uq6?k;8{sSlMSYpwmun335V;Hrc9T*R+-^>xst>CS|`A2 z8Dd-FlEk>!<%u1(Gh1LRn7~|S$WDgLWU4F|wD=k{aSStQ(rjbb^zqHI8Dvv%vztL1 z=aG?&=&?kKI(x$xAd!2_zL+Hs*}5Vfe1xlB?mzzfS#ZvkBtDtq9zBTh-_pbd+rQUcGc~+5Ig|T03Fz%0S{~f4_pMn0j0JW#Gn3jB zp_WCfeNg}mpo1njp$Ri;MumFuB@S=^1TwI=#d8Y--iqKzzl8vchD%(L6M#7+FE(1G zBq#<QYO%W2ZXxsZfckRJ+Qrs~mjD|N3`r1}>I?QI%k|PcrP9oL06x8Q}>} zxWcBCu!iv-uMW2o%Ci))h)bMH6Gv=fgx96TQe3eXbL_>9m+_22mJ63LGsiQ_*fcZt zW6c9u$U`P_l0hH(aZc@={&I5PQ9tD=BV(RecD>rR%(gB=qgS&Bb3YRj<}>eJAqk1Z z@6%inHn$lMfk2$%KGHbG(Yekusi@`p9Q~X8S^88l9Z{ZQ(xw!8(cSm{_YFNen7S0E zjh3{eEuA~EX!jP4N258{oYCyMmYlu7! zxSB-dMh-?cFu9Z~OIB_IV8G?9C`1j7z6MN_bjzP7IG5GlX^G-*}F4#0AySIn-! z(9Rc9W$kp)S*n4-8Z47I2^i&W?&c0%<}U9vtX`a9?_Q~1Q19=c@n8ZEVQzsMQS2HM zFU2S(^Ed_zx{EXG!5nJTXwrHNxUFC9CtXFgB#-0>ZihV-1woK6q*Qcv~Z>GkyS zY=8k7Vz2gSugjjn%We<%c#rqS%=dtAAt|CF+H51<4Ed68`BFj*ns0Jw!lIz>ql`fM zJaTlVqAF7Aq`F;%_kg!9twC{u;xmE@K&t z@E`8M8g!utW+2vn4K-j*0+}*991$`0AbfOV)^>yft@0}WE$}dOK}w1ZfxI$Al*39^ z!$(BWIzk|OumlAWXayBRH7Fo{fTTyTtu+Ry1{bK?zT5K$xIHXsodg)^Ke=ZfPg5d#t@ zkrKUYIe#t_p)(UJ5$Tk!I6RS!zGMQzxK7Fz6tR?O?sTzo}7)Oa1kue$nnUTYuF&Y6+8cFP71`iugtnhlt zVOA_cZNVE|3>+=A@yfCCGA|v~aUI!lXy7qKMU=^=2A$Ta9_`UzwuWoC1|O-c_4ZL8 z^(i2^Z1%iNAPdqU4{}Er^7r^)As^ECjt}{ik0R^rC7zEaJaS1%2hc>abVMggr_Us* zwEIw!3a+$DQ*tZ1qD#r|CD#uo*KcMk0eUvJyl3As&_i z7J7gLrgAlQWKL6~DJPHuk<&1uQYxck);eGW8s*fkQc?YME1#q*zj9K|0|BfA0Yh*E zNkgvCGJm?`KGxDYlnpLV?FEHHJ+{p*7sx*US}+9qg9in(Kmt=R-=Q#V)gA)C++x*0 zTA?znuz8eVGJ7&IX#_I~paL{=Ggo01a?(F`zzhRX1yq1EO%n!)q~m_80z%GMTeCG` zQxlD24=11({17*J^IUba4j|5r!o(95U{DPM63fdupEEk`mFT9kI~k0K)9t8*Kl_sy&81tu;Tu9JKvQWz zJIo#p)L;xIm#Wbk8MI{!4`MQgLKp8sX_jR&bjPA;Lpk)vJXD*uX+(im$x5$8Q?zJX z)J0!ZYhpA;`_XM|v_@@IAPF)@`DsW053)zGHWD84&4yHQ%s}}b=SW>*a-NS#&6X#u zFG{oT&s2x|wDfIN3U0#!(Z;WCz0{`4As_U1Z~0bl0RhwQqD*<`Ogk-22ZITi;8n>( zSa~ve;MFwlff@E-2Sh*ypF;uAV=AfAPnQx<8&RBHa2il zT{qnHG6Ktze(+~d(&{VO^8Yd*1YZz!v*Suq)h_G9JVw>I{9{)E6E${K8~no;0H8o$ zzYgJfpSM$B0Two84|?Ewu{V3QcYCpS6o>&qz&Cus_Z_r>7)GH7DnJ#G_Z3vZSFbQL zMgRs}D>55yMH=8mDj-;wby;iGKbT>Ohum@sB%uc>E0l$(O~j>#!# zjCPOt1!+}pX#u%yW)EtkHfpKXAa&1bB_V5jG)N&bB8jv}D^hG*0wXO4bM)+N`)qAV z%K8GWDYj2;x1tI}xs(;{(CU_U|IE*J*ug&(0dQqfE(jNR40j0-7jfAXHQr$|dD;GS zz)v6X7j}RFp5!@<*;3I1fN-Nvl@d_1qftZGO*9u#6%}JJ2n4xy-q&dDhcM&5Vb~gm$M=oLTN|NKQ2q>_;Iov!W1W4co{KFr1^|6#URss4n zYGC3F+5QDd99i9eQItf8=}SnoJ&841+G z*6C!UaT*mgj9pe@6f|Kp=8QcijbAKd*!X5IuVvs^j;o1|>lj4wIJKPyU{I8gvBr<_ z5s(9!%V@ihZF_1D`O6e}pcolzgOqDU;-QLECAuJNj}#`7G@~wA&o+`tsgKa4R4P0f zN>|5iQ;L*L*(9+$yASPjx-|Um)^^IlKgMCwVtJ=%5>0Da37DV>#?U|NftMMVsGI;p zoM8tf@t7|+nUy&L|FeU0nX*xMM0FK4n)NW(b_8`VqleOix~kXYsB(>9EVq$C`!B(2dagwkE|3)|!Spe+cl{2zneKwtCGM+z`#@7O2jgpv*Smu z`I;A;!7bxapQFQr`a2AZ#lJb(f`bAw95I$bo*|sV%_GDQBLw`aolX2y)8|v)V?z)~ zIa-5v|4CpE{A0#0{1+V>A@=sA<@Brr3>r$+{`o>Hlb&eUG0V+NIs~ z|E9s({U0EpL3>89puvL(2}+XmY@x%45F<&PNU>s|ix@BB!INj>9XxkJiZpXajLDNH zzjRs2vgJxHUAV}c8AWDIn>VBA+{v@2Pn}eL3Z+66DAA)xlPX=xwCU0+PN70gI@KxB zs#m2}*_w39l&w|1hQ(^Ntl6_fpB#OnmMs;xYuU5-U!;q_N}2jhQe}qNIuCy_oUtv&^}(WhL)2XNINVfa%i+Qma;gAc1QJuNlae zO(BEr4C+MZ{dN0xhu^?Q2p>*QH{Lx8k}Fp}n?Y^cBS=Um5q&!K;UjVz*QH!F|AGSG z1&AL{emwXB2o%t!K!KU@f6HW-K5)Lgc<=~%y#Kd@{qqbV^ky3cvvpU1cmV*QAOHfO zhk$G$L>Pi_(h0MlKCQI!%7z?v*x`O2hS(u1`|Xgx0~e&I;sqH@z?yvxrgq?X2`(5w z6Rohq%7{C9s3R+)h_cEmIrb=`hpOD5WD-hNV8L%5fRF+RAjGi5WENCl009ITpyZNC zB;m?_cP<9LeRjRbk1qOop*AnrvL<)ciwrYowl3;6HE{fnR=LD zLJEvF+QOrdM%scGWCpXs35sT_sR?LinkJeP6!%^~g}O*+p@XKHYM=)w|0n2t$+2qM ze1ghq>#exvs_U-2zB;R_z%HPGunR0u>aoZkdqJTWe43`Bk=9TH5{=nmhaT7xLdYS9 z^x|zVzW6fCxa5{=?z!luJ8rnagu8CI@cIHwy!6Ih(ckFS;$%HKO$Rv+!%*iOHtn$jn;NtSj zFynH|%rehx^UXNtth3Fv=p1v*wzzDIEyWaV^wCHoJ@nE{FCEL%P($r>(?i!{_0?Es zt@YMeo8tA?V2ADXHe_#;joD^rqxRZtx9#@ZaK|n8+;AsjOvrba|E%}keD@u)GRhRo-(dzy zCVgR&OD@3_lT5SEM3d|_^;8s3K?&tMP(PU!1zN;2MOIYDXO-1dU@`B!@y&a+l~~1B z-;`Qr)rC}D+;>07e);%C*!bfghS*|?K?a#*lzFBPnV!Yp1eyOJ7i*y2rIws)2{h+F z1HI9XZhr9_+Y}HuYr>9jM5P=1r6*OhdCr=wGaUu4sRIHO%`ax-n*7xVMt(|<|J-Ao zW!&#OGZH`mRA`?3>}L-Ia*lsy7{dZ3=Q{`rfDU8ypa@ZL|2i2IO*5L{3L+IrMO>K%(1LRaEI^ii#dn!+O8U!9z z4a!(BpkJaE)hI?u>XVe(kEL30sT6GLl%7fx19d~HWT6UJsQ<+LZ3t})WFD$`Y*V2Qww$-g~xl3Kx%x1ahHH>_rZcS_;1smDuM$(d+^rUcG**;gw zQj!JkZ-X6V?gb#d(#ON?mI@6slbs=G$ z7+m+dE{FkkFJXyIT4Fn#>_iGu_}%Z00zBOf&w5lz9$K$L6{UcMtw(8|T;(c-xh8K4 zQ~--uqKDVDq7^P_Sqfd`@|MDOZ?JO_1DW0;7xFn)Fy=b~`WU0W$4G_=@e|~GlYhhW-=Q4JX;c{)NCgFCam9rNfW?=s^eV zE21iXghnOu=oLupkY+`53<0#}0Vqn*14=a;{60Vf00!^_U_)Fk0>F!+Snn8j#NIGw zXpIRL|CuRBA;Ak?fF`!2$*pR73tqt(7cjKRXLG?T zoZk$zH-{mOah>zf{Ay=9(Xq~STB92AjP$~sG3k0*`eOOSXEN@|x0Bh;Wc~~_E?Sn* zfg1GGsPxMFaIH~g)3jrdliuvfc^ zrQ&jx9$CK9SF?1y;Dt@fT$plL|L#$NOo^DwV;yV0$x^nmSGued;#c1H>|;o);A}ni zbB`GI(wC+^EdT@f9^P~y0|!JPg|5?q*9R?J&*wgY%#hG0A!XbQ1kb|gFUZ>u?1#KV?5oMOXdOlpDekY1(1M#|JbCW z97Re}CK<_(Dzb5c;Q|(1|3AqlcodU4wE?GN2FhqY6`{r)<|+@$maVd+nB)KDU3t0w zvJ@@*iB)DZ3lq)7#4KyZW{dJDG*AQ1bS>91O?B2Sg9Z$H)@SJ=E`nBp-t-KARxXIP zfr@r8jpk^QrZ5v@4U|TLB6w*iXla?oX&ECjEx1y56KXQJYN=L(HfS?0a|;PYH4oKl zMYB*qSPV@wYZ7Hqwzg5ZmV{ZuYrM8Lzb0%@7=>av42jzwlAmI_|Rub)YRq2y3DgbyYQpSGo2TQorOZ4|;u0kvKhkvr7e`GlpHi8UO zf+U!Nn#nQFu!5SlY5R1ARw#or2v9e8nl`vY+RU}hx3JugHwtVhR`{NWLSnkg@zBIhN07j7g0JN z@l>g^|8DK}Zgdz1c36jD1rt(`hk*Ep>ZzXk))azRJYXe>3#S#v^ArmQiHrzwcBP+` z_@5YeiPGa0UeSplhdphv7L27m3(7t0Kqg|4ibl{_6IwnkH(9b68Ir+SWTFqaI3!IF zCQaa3@1YNfL?FJ@juFHjz0rFbbdA1|K+AY^U0FW`0*%ZejWRkM1vDTmngJAmb$KBS zRA-Gq${zj$cgi=83Q&%^aSXR(m5OryIe*0>tV9kMgT6Fn%@q4`2By zc3CLe6_=$EX1_A6u+o;;>X!1StyiXH)#^*psvLXztjRJ(Yqlu{_-1hSmvq*Eh~R*W z87_yZO@EewjCrru^q7$8FO%7?kQRcKmYE4-F`2oUDCn6VqimiwnxyGZ35A*vTZ1nX zG(f{@uqK48$uzKLYqLq4w`QA4h?`Bgo4r}GDHWW;i89&no1V6?#)*Z>8MA~V|830K zoL~r@(J7sj^9z1@qRh~>MJL?Hn>iM+s*>6c91xGQp z2v=8Cptb#37W}D*|5=}5JGKBSpc+S@oVZqLD_Ek~w%xNmZ+lpYKqliLp)2 zcv+k^Cj0RYA8JM-N(}q43@{dAYpJ6DQyc$*tJw&nx6xZP`X0~N9LdofKgy#>cN>h0 zq_QETcp(fw^je%tAYB)wVfR2zN?%cmlR8ADRayX7svG>!j$0az_aS#3P>(T?kNPMb z(eYVG=K(Q*rfOP5?e!i^#6|`%r#FxUpaeQ9Cu7BDl*b1nI##RSnjB8~le?NJz51)zSCyhftRT$6-?u5t+N^0p zuB9Tat3s{TnwH(Vt#A1&Vn(gpN=q>emvQNT|A)fLk|G0`!O27eLJVhhz^)C*ErZnnQyNL1Sw| zh_N2~##YlbSYrzy%TXe`YbKk=bE7hBqq6?=vMu#eGCRnFL$k<0{|(iKvx+Q+Iy*T& z>uo^$IYK+MON9sKcC=8XwCu(@OxwvUp@&hs5_~Ai{&o~$fVEevR$NQA`RSis+n=l) z%d#wSXq$0s>v2kviP;l!qi9%$MT&$q7hymq{m`HldbfGI7#SLKl_5WbyC2$si$OBY zO@Mgsu?xaSAhXgOZK9&WXd64QA6f^wA)s_4U=Nh*%|Ci{?0lp&G#jA%528y!GuoqD z*L5iLC#qo@tD6~6I;+v8Akbx{^rHjvA$0GUl=o2p{gVMBppOs@yd&@%K3O6LM7+kk z1Vpr`ZmPVD+6t>s0SD$r&ukn6z#u%79t%(#92TfD0H}dl{{uTP1L2zhm1hGP5+Y7y z9Q!bm@TGZ4(g0lIAhIz5{^eh$vPUEqs%@mH3}6A!rw4~5e2DbGkhCX#GOH8JW6CkR z=CuJptSG&@!QYpCl>)-vC&E*?WF@=-igHY6vH^A(u5szD*Xn*YoGVmzOKb@&Fy$l|F!{3#p|){&AJ>v}DP5ZUhfu1Y+Z_zGxIe6LeX#rR^yl9@37>M)vF zuwCrMU#u~psjv(y#wp`6Cu5ps9NRe~Go`jPtLd6=oZA~!HMKy;b*yW53{q@EvU;4y zDZ8>Vm~4RTH-y~Wh;zt^gUF9V4U1geI@QRI{K!9R|DB#Q$rGWSmyB+ioV4JH5-TwV zVL+apoSsb!h*$-+P}>EGh!m?l%UkQp_MP997@)GuaRpj&#B*#ez@56&9?Dlx*-gk3%LLy zeCTW(upo89CFB1=L;m4E@jTBzG^5C98w{`j_^e~zaRB|yS}-!D3j(_W;MJnx4F8i{ z@_|Ai#LxhwTO=T(M@Iqo(2p!?rXG+2(oz{j@*y70M6GZGUE)Ub^F&m-&<-*z|7DR> z0;tR+EhJETHmx8^kkcNr9~>Pb>=o#&aOPWr{~mH#DE_5grZHmaSYoDOV+Wu|2k;B@ z(+@C^j3Zu@5PW0Dwbiep93zmcc%cVieM)2PtKS!_qA{#!t=1e|!c8`S&#J;@xt1)P zWqMt$6)eLuELtwymM_dJv<^%XY1qZIEGyzHsAPaN@MeD**^)ikOPtwGOzjo8+576* z9Vls~-R&xP+Ar8rtS!b5E8FHi+qFHhu&LYZUNyY^+Z`3$cwF4{9-Q`W?<^Z?%e_y5 z0?#-CZ`}ru-8-w@nG?xD>)nxH2;hBg-l=X%JBR6=-YcQro}7m+VYMtl z1)m(X9?#x@*gOVTSMzD#_^sb8-|}X=|5pNj7BO!Xbn(k>QF0C1J$FGSfZ*U0%HXSr zw?_~Kivb3(sLYkcKA0sxe!CwUzTq3bbMK)9BhGqlq61i;^*WHvEc&AvKmw?097JlQ zw;>@^jRP;P8!;|Jor}3MRJt>6xj9~szgt11+af@Iy7@fhMZOpHMI!;7m`l^vM<(~en43PFwUFxVr|JGW$0;--FtRBLyK9#T@>v)M~bS@!M`Mz#cu4#j@SbjWNt>pkPQ%e3JolD$e=+)hkPw$*wEoah!G_=1O{x_ zMT{7wNgKA&<42Ivs*NOB(&R~$)vT>#xzd?SXECkCq*>GEO`JJzHsjgT=TDx=gbpQI zbf__;NtG^Tx)j$_s84TAr8*T?RjgUHZsppQYE-aLi{Y|W*6dldY1OVZTg&ZRxN+sq zeQV0@UA%eq-p$t6@87=001qZy*zjS)NV7F%oYd%J$dQXGqg>hYWz3m1Z$?Iq8nVux zL5HR`&Gc#1sa3C@2F>+r|JbozKcijS_HEp`X-neW+xPEC!G#Ye9x2dqdaUG{T4@qKNSbFpvP_MkI37aS0xK^pOcBnhTRiND}K2Wl1KR6h$8- zPgKGJDlNF-N-VRyA&DfE@KOmK!qfqWDk(5CgA9I&@oM3?k5=a061PTaM zR8T=(rqN>r5Fh|nTLs`%SYHi5fF2q(@tzQJMN|O=KrP_c0#sdfRslq1AOlO2wUp3% zZ2bp@Kb5s~1Ra`anTY|k6MHN=EZDkd44^V(ph!^NJSON%WH2?rEuGj#J38+LQaw}eU=3;>b)@7V|9MsRqKDpK0~0*>dh87*F#Bw@(>8m733PV*ZMfrh znOBG1uDfmp@XlFhyz`D*?z?dod~m`G&)IOl|Nfg(wHtTb>^^w;nCJve!PYy}I|_6vV<8e|+)-Yiu#bj8|X%&DwYW zePuk8-!sxco1ZoO^EXX4{`uGKe*peQfWRqE0fmzs1U9ER(7D5Os6!p=RA)Qfp&)t2 za~|`w|3?bliH~>Sv!3v9Fh29)4u1^vpZ=Usg)3xX6%u5h7tSY!4BAhHY`1TTq+P8onf$=dWLWWk9}Vfs=NlJLbS!QxDR0@R=aRVYO5idTnXRGuCc zsTWX+1aHDrrZO-A26XCEp(<4+5pb$J9V1w(x>&4Y#j10a3>K5Rm!Nv(t6y;vW3v*K zqWqMpLhZp>>hM#Xl2tYZSio8d%ht9EhAmdGLKGDUzyORn0Dd&e9}bY!%nIXsp9&kQk1&Xa5JUpOk=vZO);*dJ3ZUvCN}}gT@Io{ z+guB1K!eVGPIRLyUFi~Xh}5x8s;#>S>|8et*wK!5xZ`R`SfY~M@vbIf4PIG;M?B&Q zr5WoxO7h&Al&2VjdCY@eUF{k@={@Cod)@2y{5qHK1$HmxBWz&_BbdUxbt%a({{~wf zOBDD;RLGyU$g1J4<2hmf74UUjLB_!c+`IAEXAQ!nUWNvd;h#(ot5J5D=VRfx5p&sfm zh)BfHb}=M|p0&ffOI#uqmKdWarWXuToFWsdNF-P6qhzbtVi%WWq(<#ROJ(G*lUDIx zR|x4#YP0}6+^DiQg`i3}praCm^j|z8NsqNe6Py5PC_$PMZiQUaAtgnrMmmxLkmS`Q zEeWawC;*ddI)<;-#VSw2DgdE$RzG&|f)RwkOw}BfL5IaE0f5Stg)$Qf|N7yq9`LbG z6F7hcT;a`LHtL(N2qwc|{3?bv3Ldg*)j<=mfCo(O0b@Q?z5-wXY_?*YynIE3ku>FQ zt$EF&2$#duSt^`y?8@=f*p`xjC6LuapEW=vj^PMUfldse2Sw>EIxKJ}h3Tv9cDS16x~2o| zTTCIg>Q(y`s6HL(L%WuOq8hbxpv%MP2!fD=oKD(^m}<2tg4L>CRU;jl9Y{tZlCE+! zth+O7xy_AMv^rL?Z;h*5<$4vVVB@ZLHO0KKlGmv4Ro`lHi!Ey5|L?zUPp|{$i(w6Z z@WZYfDU5w=!zcUj_gz-v_bbh2Ee=}Hl2+rjIjw0^tJ>8DqP5F;ZEPJF!P;U+3>0KJ zczFAA^X%3=AuOSCm3yE55Vs0BU+&JG`*WcG2fEXBA%Y%spz9{xLE61xcR|G6r+26v zJ)?(($b0oDm^TXQO)q<;2&6N*IZE14McKJ%Uv1c`9$4Zpm;C!*xW}DHX>3N%n1Lxb zRY^=rFk{^1o2Ok+DOvvnC?FGcQw~SzQIKLhh?AwMoGQS?C-xKrBAusY2*G$zf$oRR|d51PT>`X4#4#MDEkbo?I|r|9(@L#KhRE8sMx^Wb9(B zM8KEFJmyaM>dgI8vz%Gc3R}Gc&c9sq!fs%I15~mA2Vg+RI0nxccd`LZ2rwCMP^X68 zgV2cdfU+>mtJ60+p?l*M1q>`{6Y0U&5yf;xSD@)eaT*qQ5m18~Pb0vL8nry>hZQKQ z%sI7G8>!0yHng!dxT&?3vOo>IHM-F?4@8`n8mJJ|nO{R2wxK|v>Z!;PHVGt~h)Omj zr~?^XDrbYXX_Gc4t8oiDu{qbW1DsQ8>lI z1-QBec{2uVkT)xQo_e!4FSH7L)2n^!tF{O@Gjt1r|0B4=P>jN2L%={Rgj)>rF`wjV zILCrGJZztd+rx@GjXtzE)xfy^p^eenxYFu4kNda-3OSJ*Ip>HDlZ&mCs}AjGx$bbe zmg6m#6OaCA5A*Oj3Mwv8WVxLq#ZvS+R7^!x3_4b1uIYM3ql1uGjF9PSkXd{X>S{U- zsgNG}p{V07Dmb!|$p< z60`FcaP*hB3os$6JG&da5fA|?5tF|AFMs*FHCcx9vj8`t6gk1L!$Z7ASv*B@JUDrz zwK=5|L$L%9l*?NaX4o+XKqXF!u>k-*Ny`U*|02B%s3spvJ=JR^MCp^n%ac73ls__) z1Gs_P!#ydRGFAu|1L(b1F~>%Mg<$D2RS^|Wd4P17z2| zdp>i@z8-5b9WbYuVaZQwl?rHr{~D4hu>e_WC_+eq7)XH^keA0pw8JYE`E#^KA#8sz&sH^PbW?X#rCcsTL$D6f_%NX&Z^zK$g;* zUPH{7inR{}!Lm##zFC|TT${=q%oH3p%Lyu>`kJn3z!u06&j}qsaJJF8!5hp$)$u`X zYfX>12(DrVAsj*?BrD%R!m?VzCxk+E|C2&?W1cM3!l}r@FKiyW_`)#MD={2He*3qw zI798Z1-M8W}^KPo1;GQ`EWP>bVpO#a5h9 z0)eiggT)KQMH_lWrBk}>@elie(c9ZawN-Kr-7_IKRL)K|6zt)34w~_v6#%50T`DXFom?F2Y$k_4hR$lxX3Fb zmR1@hK2Z~Axrf8s$dP<9DC3sg`z3HOC#Q6PlKBM$;G}~hNOk%Y0q~e?3Z}CAmOsOj zMtKM4L&-IxvR0roaVaPPP|6z+7jn@vmTZ-ZiAt#?KQz(-Dscu$YX>AKsuYly_Oq}N zJ52avCw8(aozVkfOiQ%{8n(PNw>$y3ToVDLO9QmaPJ5cXjFP?N%NFR%6YxvGl)wr2 z8q7Q!#>~LKS-%Ot199iKM&f=Vk zdh0@zy#RdxOdx+fvZ^@Sq1RMX@EJ2#wGNE!$IU zTUG2i3Z+n@yHE_JE*GMLT&zV0F*@qXMP6h&3hAyPTDo4`kY6mKhN1^CK*k1PTo%0% z7llR`-36d58GWcx%w>{QD4BO~J0AVU9}V4Ah%fw8hm^@XJK?(}$)lVnwB&~+ zc!4`L6XsQ=r<_UFQ-Bb-KWD*#U%54sJk)MURH4k4MQs451OOV#6K7xm)Z^Yt^%Qri zfF~QLO?|!@l@f%JGu_i)F0m($K~+_~r;i~Qi_w^JsQ?Fy(ORVv7(mOOIRst}8?UUK z5!;jtRH$Ct0SZ=D5?RY;byiEev}lczX{Ad7v{tIgRwUU=7T6rD!5UOEfxs*qa*Z4m zTvs3dVZfQ2!nrkgZCA-uR}!q($H7-(+e`^08lx#H(UieF$b-@h*g_!K)A0prGuVZ& zh=i?(*1Rfa|7h5Uh1iJgs@j~1BeYoHQNoyL24~pKph$*~6^c8CjBNniwpoG0S;5lTxQdEw@YzdV3@V&M!O%{`z|QdD`+jz{aRlRW?>#?<1*Wt zQ`=&WTV=+N1c5~h^;=rRTfBwE4y|VEVmb^7gJkU)a}a|FdE6FlFCcLOC)fphXsCT? z1I?3(BIz7FDn(0`Q~+fMIRjgZXWj;#(&H7{BI|vsS3wMp*^| z=$E48B`(@jDg&1aXaEH!07fg8?pxIg$dau7zKwC-b$qW{4U-Xo0ikXbdZ>fVNdX8H z8*;6{o2r4fMiP3+>k)pa5{6=;Nns>e;ZPgEx2NrOFsHtJ8IpL7XVZj{C zR=aES?a`!maQwWu!WdqWPih+wSZ*0kmNK>EbMeQxOz9RKng09@1#f!@qt7A7UfZn zj8cX;&q&%+mbg^LpH;@VR>qB39w0@e=A!nvr2I*T`q-JYwalo}99U25>%?CvQgB4}bCi)R)9A{zZ-!)O^b!O+1 z{#5#^(Q%qGl6LB}%x62%0WOhB*7fH#0qBJxM=-HdU{%N~MQBh_=r#F;G!21z{~Uoo zS>8!PsNuEf7rWi{GDOGVA)kXcYpN16y$bcPaD0{#GXDU8U7XX`PY9BWdL(fT(zQ&$ZQiM@w zm9!X|IjAQ4m@6^Av3@7Brji$c0VH)VFaZ-7xRiKE%X`p+7Le>7r^$)@beQDPvD%+3DcN0YU|IoDsi zOw2UxpUT%3+`mdIDi`=yD~|2irfu4`?b}uztoq_GR#7p?cPG;q>40T*+C9(=)pJhM(?($S@q@~ z_Rd-J;aRxKEBbzK`d$kB4vg;~HwS_!vsGvMW3-f*-}d$spvQ512vFL4)=E)<96z0KQLr27`X zX1#ZiL=fSBXa_|A1aOAjA0Y&BIOnv)h9F<()s-}T0P_E3vu+`2eNb{`)de?6-3RXH zYjNizc?WQG1uK``OM#_;3M99&q-G}(Fc0&TQB$xKNMNZMn&gv7|Cxc+{|9w=^BCy; zt~7lH2x}!JX}>QKf2fB(uYgH!Uv=q$+(!}|fYqEN042ETMaPzI+9K!svn^5nSh0W| z*nvZc$XL+ynyDmDmT(uRtDjH#F{xe`&()Upeg=PjoOSYToqmQ|TamjQ?h6>i)} zV(^AQ0|p2XFks=~h=?z0EUBpDB8(9kI;i{S@gvBPA^V{#L?eZXlqNiEXnA1*OqdH8 z%+N(oBuPU*jp_C+T$l>x(yeRv?t!~{_wwz#H*enq|AGPM73}x$g2ajAGIo36 zG33aPH(a1xS#4UQDNd|t(SimNBwp&&u>mgixwYuhr#p*Y-5K`m+P8D>j=dZB@8G*ND{uaM`EBag zCsW@(8T|I@jnS`f|33cw_p$Le#{WNn0b+9tfdv|9peYF|xFCZKGI$__5kiOyg%#Rz zA%+=hxFLrb*76~UA&NL6i6ACei-Reu*kCreWb-10^tEVAg*C=lABEZAcq1+{zGw`L zKH8_Fj{4zuBaZkbLtlJNI{74&PbxDdl~r1KC6-xQ|49v()F{&>m|==JCNxI=bX<#^9-JO>bd8hlKA;2pn(c1NhF0DdT1n!FcJu(jW&u0q>)B? z2Of9aVFsp|YPzWzW028l7@>+fDygNKdMc`^syb>Fp;qxKtg*fthOD*PdMmEE>Wb?W zulDNe6u}Bh1+m3aQAM%B4r?s4%?3-wv&~97Ew#ixQLV9qY_+XN`Lq*`B8e0N2x)Zy zQV1d8pwmu1+$!~sD)GuYFTJXWVvs)Wg0#;&+Gx`XzybTK&p!I*yDcw0=rGDM@-*@A zDyswx@GAwsJFzRSJgmbA9YoY|1{8=qG6N+u|3DW4DI;LbR=;Er!pI@W974z#PeI zAo<5X0=go92s9uG-9kYGS`ipc@kKFmv5dE<(S>l)p*3#kLl`O%9OEdW0--33c3jYl z^4Oz2+Nh5p;zFX0wycMP&+L zTuy#5GLg*;W)v_P160N{1oSKcKYJMokOonlpd)EYTiOdeK!S)^KnGM)1uI&CwO06Z zp2ma4=iWwu3b=xAcDtM3Sg|)&$O~_PGeFxILO9O_fB_@$094Uo(|Oiosh{(l=nO(S zQB)wQt81O%4EMGIFeG&a|49NuDuBAON=;j2Y+<~tZ5lma2^#Z>bu5<8?tsy@+! z_k>cvqKI!Rh@ z;IO$m#13_UDBU1BV~Exzq7jd%#O)fRiBW8%k)R03Y+$jx04n1hQ`AK-nz6kFvJe|P zREsr+$QE+EZ-@$%p!KFVjDVz(9|PP+0RQp3Kr$qbic}*2=Vy`naWEt&Dd8wxvcj08 z5+^g9VNi1TOr-oU|D8}NVm+<0#F6k*D-XqpM8PtajG`r^EG1)Ha*CH@7$%N$>`P!8 zlbEim6*6@dWM&e%$ijk^vYvS?X7!3$u-aygL>uhXr~HBsDv0H$u8RdY(X00>8r z9AIP{fNNZ5{{VyFK`kbG;I%yau>-Z}K`DUs-e3vKt-~T#vFKxLPTF@B#Y(mXNT5Lr zR&auJp9QvPNv&u{EARjYeBcJ3O9KJU+6nqQErQLU20KIB&~QNvr13)_PP5zIzUH^V zz0Gi0*g_W~i<w#eI6Kvqk9O0`Skl1)={;fDr!0 z|7j_}5Ax6ctQG~e77sd{Y-tb&*%lXoff(FDZZ*nja9qck(8uLQ$Q74xoE#Y%M>RM@ zacD=&xg5;3p>|l8d2|Celm|D=q0QYK6M0w883};U#}rKwc?F#y21qKTLe`}hev`k~^jZ+wyLkBjFKCD^m)r&j59z4aKsMQ0&L`?YU3qP$I|2n1< zr{SK)SOE3K)eF3p?(Eq`^_lg71TQF`@+koHC7MSqUkCsn42aZLR0C9{6jW{B3s{;G z^pvW#BTkGTsD0xp1~Y)jaTPP`<60W2T@6u<&JK>sB`VtgA%dPFm< z4nr^mu*r_R$~(FIIU08Q3pPN>5R;136Kj}FQf z3i?DaMBECF#k;*=49=UonNL$3!42M^SY(i8`5V9yVG+iqQ@X`m3Snva1#0n65;g{F zxt3)-;RTUk29bpe9KjKA!54^uA1r2Wr3S}&+!yi&aT!+`k|7#y#~Qwz{~NZU5H$mN z&|w@J(aqu99`fN8$;coMVj-@kA(}!VS|S*&mm+de)Hz)vf{2IA7bN1>7j+TV!KQ;~ zqHqe>c!{FdmED4cB8?bHDNdLwJ|~8~qI8Z)EV9Wgf>8FyBo;H%6AGC{9 z2B1Dg%s9?Vn2DK~#iL$ngHfr1Kp9V)!Q)nFL*2-k5?BB}LS#hlqsUAE19a9uendbj z!0{DYK^mm=C8W@3+oLH3Geo3~dO)S=fcNDdMv8<+x)}i80}cSC|EZzcNWx$IZG{7X zPC?v2vZc92L$HBrNjog01Fsq6^g+XVqs%y zTyLGw7lPq%jocVkre$6x%WWpGR@Zox$7j-^9h%1+ZbKc8CK7>N*ojwuq^7h2NFiba zYqF+mx~3tvCU7F%Y(hwV=_VsSqPRZY8||jmeTXEIkr;LB|0ND5yxK^M6jF~U*w}%h zASowvHm4*(Cv;9Hz;=n5q)Byp*mZtbcAnC9npiHr65z#>c+yhgok4ll7%%mbFtVq{ zl8SqZN~=uXGBFe6)hEf?XUP&-e?p6|jGnPv(=~2mH(dhi-RV1I%$n)bg4#=iIw-!R z-afDz{E5QmxJ$sS8jvc5hHmJ@tU?p$KnDb0(}XBO6(0qV=*gU@N9aOBAsRupsLCu_ zo&g{53C%)c?LRPs?pzz3b|1ymO^=4ej~*?ru}zs4X)BPVyoiEHidC5kz}F@~T`<5N z%xsy#!;-p91vEiE9mGm9-~g^40oLuYfzD8-DYLx}|Ln}go3_N$P(WzG#0K6eI#i{@ zq1#r1gdPBD2AwWWbS0r0Dp-O=qKd?#j-?DLmir{uSCGY8>YxR|MN2S7U3Mx1xhWC8 zB@hyCU-ZvjI)-Y!7GOrNV4A>K6ebc>9IRrY#x+W<+NuiSDhq`#ua;r3mTz}-X0bLy z9jb2~CM&Zh(IEX-kwB{yO{@L#M=DtBwZ7*5y6cL3D{YQQZi>hNqpP~+7m8FOY;tRZ z#H$0xh=cJ6fe~kbA*Tf^C%;PADJFxzrlOYw>~s!n!5ZwrhFG4IQo`cN!md(xI_%%^ zV#G=;#hL*d+>$OS-p1yzs)X#1&1c9y-s1%s|1+K}5ldqcuPm^{%75;s=T*zgW@EL4 z!8j0Z2iC0O+H8X6Y&r6*gJOfI?SrZXtt&K+`~4JzCav9IOo!ehh(Z;fQLWWJ)K=)i z0ptuvd98~wKmfQvN59yT03Y}93$P50rfmjXfXK8|MYb*YVU5x19+$y`2owOBvLpc{ z0g}o~5}4%WMl!IyjzirA1?-xr^+ON9&9AZFD(LJg+zSGl+E+1^+ej|t%1%)dz?w1} z?3~O~rUle^t^(DCQW63c^BOwTKv0}&V3FXTsxDFtDxpp)?1shcjs#hbCGIw=qehm* zsb%lBC1$Y2n>I%C$^^j`AzdPGXDRPqg!5a7YX9`|pfL|cpgQvk6ebs7?_vVNJ#(*b zd0`6Ws;&~p_?n!rns2bep=YAU`l<&vDC_%vmm&Q~{OZU33S$0J>;A50f?%uvst5o_ z2my~PZq^sM8nD$t$VR8g1E=&KDUxtbaK5s%B9USSQ&#y6MwZ> zQ%e;LLOXn8Kfr?%Jj@kmOoE>BIPR>N5yV-E!aL{{7~2g=y3^bGL>b%78L!&XHmyXo zF-sI*p20+k%CS=D0!Q%-Wa|v{Et*|@%>UT-u`_H1GaOXSluS$QD32=gA~Uj0(Ze24 z4gxeAOL|q?v>#E;3sGJ2Ry=af6o6`fB<6OqU66p;8c#j+zyN>_>NH>lP>oilGO;aH zPDbvSzH*r&ZbG2xnyzW)8gESWV4tHsV-lB4$xTaV zPV4keo3Ky+bWjJ%P&=&OJ?x9c@GLF0dS)zC6Jy7+N)P++RU2bfE2GES3Y%v&o!7an zOxZP38J<6J6BkPubi#LU89%6lE;zwjvvpg$HO{u4T%#3TJE$mV!_XSfKA^E)2URX@CYiM$K5Q*}?+PO!ss{cA_ocMp$-4tdyPl#AbJ{ z%~*~Se4pL)^+&|5(P{&y`vg7cLJjb-%qRdP<6qkxWdRHzs%1J%*-Hg%iwHdSW8b#= zU9M!O%mIn}Trj{6pba|p!~Zhq!0Nbi02KEsIC@%DK;ueaD>ESGdOMNsR9aPTtQWv` z!^Hq;w{@e133!2DZCN|$L0Oo^^r{3QU?s%4H=&xq2bh2cv93tCF2#GLp~^R&GAe%K zw^i8g4DPOEW#y$JuXV$vUJQ5;9&dpQJc1*kfPXTP(&t_5Yby{(H8$R8RGgaqJNH*brB>ork`ii?!!PnXOO@8zh1`1iCr( zLq4DbAuxgL8~ULmI$PhYg09mR&ox~W1kZ}XDriGJ9Q!};%cs9z(7IFbD@CP`w(~zf z-3+!8WQ3`E0IF*M)h^W5+VNxW46LgutZ$UKGk{%rjIBq+p1q9B^f4cQ%r0M)1=v6m z0K40Y_GtSJrx`o9^g}!B!3+Qd34t#JhF~Bd004yx7X}bepnw4e4Ga(nP+`@o3K(0h zx{;6}fB+5)ATW6n0Ym`^L$+KA5oJu1Dg}suWv|~qojZB*#CNQRg8&99CL9@n0D&8> zRwZ#-0i?pCBmY~96uVWzCj9bnd(vbm-74R$L~1 z8Z~Mbt5vfwVr2De*|Lw!wmo}w?$oC>ez zn0_34_TtpJclTah`-BVQH(VHg9{q3*8#uIg{~kUE6CX04IKBD^7cgSPnDO)9k3a?q zBoIRkGz1Yu6j8*N1|9STmu5K#LSK(Lx&~G|?j!J<^zDk}1;COf}tHj-r{ znU>mWr)7i@0<$HMTW;~dr|dJCqv;Dh_cS73w*c9`IZC7zh#iY>kv zj=}Kb5_a;*Cnv#n>L;Ie#5shCnr*JxiJY6*ndhFF$|xgMgce$qqKkIQDX^3V3+W_` z7Deb*q}E28cc_;7m8`Yinrl|P{+ei`GirtEdaTw4Yp&H^o9(q(k-8&Sn$V$x4m`LU zZw>U$fN#Djpa3fcW`c-t!dF6Qs*w(V2qpxuq9B6~MyOlz4noM_Z?q@~fpdWb8ewwG z|F*z_8=6Ra>sDOW$)C2f_F5IAy?$kCsz>Qz2N+6-0ff6Zs2lXpDbT8_kzgtSuK$WG zx~PGXzJjWF#!X`2B$`;_N~*F-k}0JE4yQ^a1RTJjhaO;oWt35NamAG+DzHeZkqBs@ z0t1Hn>S{#L;;0IaKQ>!sF=q5<}sp?p$t7ULmPsoG?w8FZ&s)w9*BRLL zE`Q1^USSC6!U$SWgZe8B4YOCn3Z{jGCM==!`q#o78U`&mRAB~VsK7qfQICEUq!#m7 z#zrdAl9J419SZ{(Sjrzi03s2E00bcFz@L`ZVF@?8S$TGN)cw5B<& zXhZuND_p0xr9PDvLlfI7;D)-UUiEde%j(zQmXRhX!2)&D0Ny;XH^22QbAp?o;TD&; zsT_`Q2%rmE>c+PY^bK=Z(JSOQH-Zp=ZUkthfCX@%1gf?|ZK_*c>)Hmk1R_usOod$% zDpG(1WB_mFxd7!VH$49-u5g9BUI9Zwl9-5gv;}ks;~F=?wvrYA6-Yux64(Iv#m@kw zvmXHrAX})lLVpbLpGz3PIjkT6aj;!T1C+KAiV#412Y4J?w76CZ&ZUbJ2##Jz(}LRM z5rtIPj~HGG2tU{qh3Qpq3RT!b#4HAiHm&MF^6yE@E`>guz%H2!F?n;Yp(!@#3BiuLs0(6fpQ}U8QZc&YHYzYU1UVxh$tO(Q=k%vT~J^S!Ofi!bpxfGoUENW;8SEQq+|5G_hG{ zJF}{rdDb(n#M$R*loQavLg%21wN67j%bo3n=R5;xPeJFry8t@Si5?WwnfBL2 zGYT+=S+vuark6u2`cQ!mG@+%A=tBdhg@>^^q_M6Ttp8Q*KySSAkt|5vmi(DOe*T3ES-hq4Ez43b1!CJruv$bm06zej^vJG~scq{@% zu~hw4mH`w?p$Zom<*A*>CpN`^~X(^k)Vsa37^Q2XwVhva}z(_j4vD3adVuOYI1 z3jdS~005G}xX3*@SG>~Pu|St`XF-c{>T-aMU)O@##UOXRD;xDb0qQ7xf)UmmUMj2? zk9c%1d|_x`8q(M6Vc*RUeJEhEm)-3DRr_oBEB_m_6BsonXu*N?k{&8*m%$CD@C3w2 z#sygC?|T<~bjtYmzF)YEUL+5PpO$9`pFesZWuRFKJ}gCt1lu8f7W70cG1q$x2n4^6s+)rdN)cPgoZIFK^Lh;}@U! z!lxzh$$aKptQk?wY$o*CoMtpP3YwLg^Y-uDeN^ok{CW2C_yb-3U=cc5hgQEN679}K zGnzn;wr4)km9BnHy3zp^b-nhlX@vTp|MsN{F6yE(%AqVxqAY6E6mVV!aMVx@VlYZ! z9>&%x&;o6Z)-vj1_9fWFpabim4vNiYc>k)WkgW-nZ58t8sFKFnlm^<2MybB$s=f_u zur1p};jjj-+q#AZ6K-faVik6VZXgHU#!3S^;0V=CblgI4Le8x^PTn3ut~3YV@a?#! zP_Oo_3jYm(4lA)%=N}HvZK8^3!h+!(D=Zp70VrT{9!NYcAg#PdxRA%_j!pn-PPn9S zCfw~P@X+S8r>%C5AsS$|V#j@&rzHk}bZ$#3zQO?fFaQuB1W2F+aE^LJ4z_yhd6Wmb z2*-gKpe>$ba5k=jx@fzYuI-*K>Y}ddh^S+#F6&$%F;c+5Vkqox5f?=R1yJBLb`b^4 z?(EPmh}KT++Rp7@L%#?tF`kI-qW=gzE@<%7;_xu6@S-sq4Nr`wk&6t^ip*of)aX6p z2=d}X@+QxY(9Q_JiwnZQkN#i~-Z2qAuaJTPkxEa;m|;UaBp**NL{#s`SWn1auaksi z8)DBOZ}0YUuSu>%_jr%Wde2LkZ%o2W_-g5wF4Fii5>1kCPlU-7JW?XV zjA>C$5>g~(B_n0~xbIWEPbNbp{AzNW#;?!J&-~DD(AH0#+E3BqDG=VT(d18D=+6u! zZPMH&|N5{07Un7UB`N_B0{QP>N=^R+>eLQ!UhJhQ|D_55iU7eaA%h7XjZTVpUo*?P}-KNv3k%3Z!oE<3b7Dw z40{l&!bYk@;j47O0w8BR^oFd?EpjZ52~*;Go{%e6OL~M3aI#RZy5}T>4mI(ObOO!` zxu)O*Lku4?b`*%=BFhjJ$O3d=1kxhIki+QiFyoGHfCOo>7AQuaiG%Ujxd2t1P@fU&dhaA*3goqd?bikA`?wYag z7|$B7$igCwF8;3Y0RNBg0&hbd3>&p^8%eZ^&?r5|(M8*%93^iwS|c5ah(E~79p7;f z1_|^OAsFb<7lOea?~y~0VINV?A5#w?Wkeuf&mffyA*Dnisbos1v`QV4_q=44LNfR& z(v~vv_$rc1eed^PX(W@$BvsN;Qc_K;@0kXr&2Zr*sc9y=Z&mPYRcumETjiU;2`9rz zC(Vf`&&em*2`H&$DB(#c=gBA`?OT#EUE1aT;N>eXtt<7VD*I(Bt0Ss$%3>EGM8i0Os(-1eJ z0(uh$Iv_eg)H;T9D?rP7kaOfvYbu&E-a@nH44@Fp5au)%5)mK+zVkaXU^z8*D9$qq zk*6*`)4GzvB7lw#4FiVL?2~8H3qP;!74@^d5W_N3ATeYhF*GQLP>hKR zG&F3{X-OkNskT8O6l(=+Lf5WB;qEl-qcob4@$^pcK-5E>!|*=zL<5g)OVmWo7V#o1 zI9C)LU;lI*W7HgRsPgzLKi087!bL}Sv`2q5NQaa{@Uckwu^*FklA3`uM9Qxj0sE>$Z( zHB?8Hdr4J#CF(0jwN$+~dMg#8c2xi~FfBQXp;%P{UF~5i3VzXmes9%&bCqD=H-96B z)^IIW)Av{J#isVdF2w*Zi?!I0b!U_nftE&Lzd|sP3R)v;Tc4_0tu=pC0b47WgD=<+ z0sr#`NQVIuU;!S$+|acM*Uc@KQ#3t}BuZkgP&0z8r*P;k3rUA`l%QXA5MUQ;2BS)U zc#FAmQxp!dw@8Nqr~@uAZev5!VlTEm-}Q-I*bf_^UxlW&rdVVbq5u|PcT6?|#FIEx zR%R7vwMs&|M0kZ!OJ-%ZW^Wc}EAKU;;Ae^GK7$sIuP(i~U_Xl%F=zmgX<%tvU`BTX zYA<6ld}C@CG(mll1&$zVBiR_&j*gEAYf~c_QKN~VXlxg3!IZ9SA@)T1ZbZunZ9&v+ zttdDFFK$D0ZjXaS>(*}N2yf{N>_USVA2c>lh+f2i4FFe1d9)Iufp8ln$0p=RJO3n^ zKZJ1`cS)Nea*b?qW3O_ZWcM<6a~*PZVJURkq;z-5m+}P5wpmQD#B~n^c4b$c)$IDL z&rJaZcVSX@uL)LYvUkDncl|7Qe`R=)rFfs^c&R0M6_rt$m;TgcDNQwdy*FQ`a-y2D zQ^D6#D^+~U7osg1qw~+A21=poMb!{y)CdsN7I2~N#noI5f7zFP$>3JCpnmHYS6hvK z17@aM`l8Bm0#{9^3u;pdN?2Q}#fTMwN6-lrSP7b~s2&)CUGQ0Lkb}u^GKK0dlS+f5 z_1df&GCi1RSa4~O7%NKHgf){h@hYvFP>TBywvM7S=ju7?@HyiOUk6JB#Q#+ZT!GtU zGhmyl20vnD8SZH6Cn@FvE=)o$#QE)xcxDNJ4&gYCeaHyvn5FbMysQq7QA%j{sE<{MgOI=r zyx=evBQf-r!0L-W978jH!)Y5iL0P~BSm0_U85k$@2|8x#pw8`}n>BRfYrmG0JNX%} zac$u?ZI>gJDJ*R>3`M5{8^1`FXL*kB_A+i6mv`|#=GbEdiVfaC5Cq{7`g;;4p%R9f znCX%9h_pzTxkH*+MV@)cqFF}>a+)c(a>6Ro8JdqCoh zVOTnrxIN#BwWjdjbU=sMM+av!Fa&m5ZuRDlP2pKPV zhYrlUIc)HlgKe=Wyg9zStr5ZiZ#W$tJ>r7Qx#hzgtpJjZ;|NpGUd*#M+e8&+jpnZH%m)Ftg z4-eRd4FX?M-9^hUTBGy))E4@C$v4U~ddjQ($_qcs^H1{0pz@u(dK3TD?%bml2J_$hIe9HjB(@hu;FKNSFj_0I<#_lHf;bxP5DU(v-?2Z{=Z z9lfZUMyRk2F{65@F5UR0I@6!p2W_y^ne~AgK!QYF)XTNh`%Ntv0E<}o2}RQ=JR2t3 zTGmZYts6*RM?eX5#;zMPb@KW!6OOW6&S0OX0jyIb(qGx3ld}N=fWUzS3mP;SAfdv8 z3>!LpNZ>}2BsVG;2=FlD!vF;oWYB=&K?V{eLjNQvAONGlgc=JfOei2G0Sh`RHZaiO zrU3&4dJY&s;Ac+)2M#D;Fk!-mr5j9`II&{Ik*QI@h`9=eiqN2+){TlcuU@-+`F{A|^l9M1g!>vsfjDtu7K|G^ehithk;#-R z8|jL<>tq&`IY&v$xiaU+d+9obO4w;rrmS1Lc0J+3hNQG>+oru>!Gzqrd*@ENK*8yXPNyQH(-eAWqKYoMC^XYR18Jm^PD&{>&sh3Q zrkZZbsiu;A3TmjLj{0dNrk;u_s*J44YO8^~`syFD&PppDc${$t8@ldlh8b-5%7z+b z3`=aWVH_LAu*s6KY_i8Hi)^vXO8-l3wbl|VEVXK6TkN*%N$V}P+77#Iw%mS8?zQQX zfd;$KBC7@(?JCPGvSDZ;@4U~-8!sCD=Bow1`3_7l!2ZT7aKQ>MEN>O|q7iMm)!MtR zy%t}LaTs81%yGwJ)X`R3ON>l%$xA4Ka>^>}z;eqL(DZW5GFxy%%{5OnktjOvtV++S zumW_@K>Mu9&Z6Lqv&}Xmoy5^i8_o02LQhTg&_ws_bj=l1pwj^b6o3E%2_&$<0}ot~ zK?WCGFaZU$E$1~#FTIpf-7&=kQ%ZDy4R%pQ@vZmVFoAuP1u&@Gge$GQ!Z_oswDM2n zl287RKaF3GdC;mPVZcfQ;Qw?J0SpBoz}I)P)Kcmisib=A4hdiY%@tXMlIy7pU{q{o zXYfJ^Auu4f;HOIC7Dae3K86%20}u zP!1Ug;@P$#PVws->!0g-b@jidM72L#=YPD_!+!n7}%hy6QD8 zdL5Hk%UY&0wN)-*MRS_xl9;*3WlU;SRyLKDFLv>(U+g-T!kk60ZH<#(Xh@jC z{&lc{!INPN`_1h$qt&bmMN5FGizwflqM0RK}{4y ztD4Vt#x#mRbpNAFYr@l_R<)1{?P?fJ-c3x$x3H1TY-<}1+)xrY(%o&QF#+7^Vp=-B z`OS2J8;C+mhk(Mtpawe_nG+P(im5@4a+I?i=ANoKQQSau00;n3e)77RF2r_R?W$K@ zQUC^6U~3IvfLUwz)q`;4072yq319#Nli*Ews2g2Xg@?BaG@%I1DF(KZ`3x1RKn6CvK@jYH#2^w;MEl$)iArQ5 z6BG1ADmqa>`qi%$C#1yycgTwb_Tm^1j9?a>QA$!mql5Xl$2a8b5>iW65;2!XtjH9rI80}nsW_v*D%$pO!)@vxz=?hHAMgeC;)>UD0>HfRh&|p+Em9?P1>yJSrRHR zyo|_nt{cgATEFd8j+oV~Y#rN4!0i&Cwsis|m_bQS5>vWvwW>p@_fHj~SH9}i71svr z=bks%!5V;iiDgP)8ta862$Txyk?dqEd)cuZi{Vk&EE1-21kZkUF5@X}UUJwM;69}; zBM*`Oaw?k`VmWo zJaLywyyDDfDUzDsyp}j`3^j#*#+S6Q>FLy`PwIH}IR3Hg6D8yz8`;RStVEJawd7Rg z(p6EGa;v&@Q;7};!5VB?WO3Bt!4i7U(2KKUjw+p^#zosw54apQU93+HCJ;{ ztoCU(vo#5rfE$%Ed-XJ@mTDr^X{@F-p|fo>wQFO8TpXkTf75HZrc&m{012>b2*6V` zRa3zhZ!SSPgfkLEMN~V$1V{xm6tz^)7CHV9fg>eVRFyh{qitLj06XDr=w>_OW>yN2 zfh1UjU)6%UCL9!yHVl9O!X|H96#xWa010S;d6N?PRslDVIJ2V@gavScMOf6+LI%fJ zNU#J<@K|8L1r%pqRPb}tL1SzghMBH0>EWIir5#5 zm_ICs7cI9#=TR9)5CxVIbC~gmPhfL5haNcBKd=QqaUpU(H(W@kivLA-bcuy@OUHrG z;dCq%b;~gv+f{Yh@c|t0T_1pTe32M-u|ML47(CQNVbC6pARmt~3C(DBXU89Ew+zhi zcGU=XS9C>lM|XC|jd|yddRGc2l14Q0U^N1Gfwy>WG)EO?cso)hKEg(Nv?PxAB#_rf zHIfQRB4U>}VuXZwotH>229S$1ddYw$q-RN|r;vFPC#lDJ4;d(jQcAD)W3g8$v$rYH z&?&cvWVv@syT>ZM=X-x(D}NAt!9+~NRD9La9&E5p(no04qGszylQn6RH~DAjr+(Sz zXZEyCHhC~OnSJP2es+eF(5Fq^A}#L+e~HFD^#_$maDOoH0{>L`0$0g@{a0!KCp$}% zQ8{C36KH@F0Z|HQmRrMsIHNOCvx6a3fLY^e1b|mLrBcxKQYUyfU^6!3#+PPAf+qNZ zUZ{d|gAgsK02D9+F)#x)AOl3@R}Lr5DkDbVTdxbV}^t!aQ|jlh*fY0*I4w2 ziR!^{S`l-2n1^Jshk95Rboht5g>f4fKca;fcj0j>mxy+OTH^5(DNsX+L0&6o9>w@t zq{SHww_Bl+8JB?>R1gM#$Q7Pwb4DOrHs=`l`4}0;0{<&87w*#nJco)B^opyA&kN}jEr$}lobYo5JZoV36KB@&iIVb zn0Ebv4F55W)<~mqw+-4TVBFY^-^im0=3oxScR%{0^!Sc>l#YjoBt|kMhj*krLZmnH zB2jW9h{TVA)FUJ|kYXZ`S-N=#iIAnIkf+Cx4e3c_3Xx~pV?9QZr(}_;gprw|ksCQG zw#Si@;E^ENWFyH-c+dtXiIT$9E7ziBONmY8;*!=kea)AYN6Dy->ZszUeL<;xj|!VKmH$|&m0HP_0r-_4MNt!VfC#97Igt|y z_%b%514^Kl5cmphX;G^NmlYtF@>Xn6*nvh7H+TtD31C)cBNEX101U7IV-q%bDVV3T znFR5K3y=XG5Cb3pu2)%U3+M_sC^?iFH4s=)LvwAQ8Jel1g$G~&aucsyHJT^!H7aF- z@Y*^Akbr&@Hp*dERXA7iCT|4L0JK@Ga}zsfX#qLWn>%q6w%RoWH=K+W7lL@4>LEV0 z#hiI)S7zJz~ z1`Ib@_eonf2LwL*7)Ia%Fe{(~%2+9YTK@$aLDzwxS8E)w5kWxrTn=iNvS=F-dK=c0 zi!+pUCx^C*$e|os9_6tZ`w5>^&>klG2r5bmcS{NK6%8&5ATi1e%K*5|unaT`Maf{J z5`v@KsH1h)qm3&@LJGML2DwlAjz{`Ni6&cIW;{+ajnc+Y_oSv^!XVn8=%*zorj1Q$;c( zyPO0ld_udmyLz|Frm&a0M7Fybd1SpiOCA{sz`H8K>wA4lyeFxA$LFc}WKFtqyv%#O z15MC1S-k~qlnAZR(AP{9b7&i*72V5OQ3)4vA-?3Rs^;5&mzKUav%c-iH1Au6gk`Z6 z5Hl9 zm}&(!3m_XFumMiJ0sj~9bYn#fAuPh|>ohr&QP>8- z2#O2D0-u!^RBQ)JPy?U^wWmn6i@eAa#SAeDxHD>vwA>80e7IPYxVv0nCE_8#{EespM&UTj z^*y=I?2bk1j{lg;-V#G3sybC zS#1$GQLBVS)~YiTyJ`Uk5a-%j=oulvCU zB4Gj!&G%@JkQcfh#>|$N;8#kesGH3TUXTz@V-ns;4N1=BeBq;{;TsMqkCM9{4ok8` zr~khDyYwt8Cw}58{s%1H;wK3#!#7RA5|c;i;=#h>V^8*FZ}!iZz1r(Nkww{os1|Qg z?ntiW<*U(KDKk#4G*Av|Qm%!3o$6Jtz7z#CTK>`{41ua9mRK#TH^37{UFIlQ0B4Q? z7=Y%)Z8mN0<_Mdb_0|(Wcvm$wUA49VW~EntZZs3Y)hm(IjlMb!;4+Ht_;1bn2$6y? zwXaEdt(C6&+d4X1I24Z${6egSp4s>b;XHFbgc0S}y{YPe9h|MsSb1?k0z?H?K~P{} z>yCXaWRdG7+x=Z^vWtzMO&eOm4nH7wTBwx*UQh=#kOH7B9x2yb<}Vdj!39FVpZ~q} z+MD=^T~VI^VMO4OBQ991K$via3l}XCwm=dQNehZCOk6Z!F{8zbEmC0I5Hh3*ktIV; zFqv}0g$XTPzJwW5=1i0-ZQd-&a^?b_3Vi+q8Wbqanj$$IMT+#p(i2UcK0Se=snn<_ ztX{>MRqIw3U5z}UQbmiJHErfN$^=R6q)O4ENs~5g7&E$bm)*VFOz+-gefw?$99VGR zY}t$zMw~b?HpYz|KZYE+aVpA{Enmi*Suy|0qyJhRHRjc=K;>2_N#+}@DD%q5qGoO9=x%1z>aTUjY>;F3O?YePw z*Zy7nc=F}VpGSY*STbYAawU83SN?qZeU;tEpI`re{nV)8_wPRc1|+aR0}n*-z-bm_ zut5hOgm6Jclku}2@(0Fn(Lha|E{BZ(9;NFSHv@kl41gfdDgr=+qdOD(sAk_<1u z{4xwN$0W1NFublTCu&EQlc*I!fUMJMYBv&Jp$;p#wfG05nhwZXmQ!LkmqJ z(L@hrv;s#BFn|C_C55z70~&C2P(l+GMHN;)1(g+5MkTdWQ%?o8)c;UdO;r_9Zm2-g z00f}5R$FUDAb|xQxBvrRF}NVu2Od};0b>zBpnzHf2mkSJO|Yn#B59%72%`$8pMH9ZDw39ZYAT>m zbIm6PBIqE86aqVJu@j=oDU2@S;OvW1@WKuxQb+-+rx5C@ZvP{WFyf$t#$KWBz59;h z&Ak04-0rWQK>P_HfKZ(A#TQ3hAiu{xf{TJ4YGKZfJh~{N8s?;7qKecW2`AHY(upY5 zRX@G;ly>6jTcKtjirbk=N-FoIK4^+}sI01LE8&M9zHYFj9&3#^Fv+BONG73#9Jk<- z3z@p`%8Rf11_KPS_7nrZFv-T3EEQ}hn`|@n*Jod}(cUMmv((;)&9qeN$KN#N_TOJO zQ-mu{aDXEm0A|O3{No>VYLl7hSjH3%gpPN#V?YWPXFJ~sPkJ=CK@OH@J?&XfeCjj8 z`S8btCkzmP{-cZpwa|qwj8F_^C?RM}<3cyYkcV`r!~YWXa72@sM2dvyA|f&ZMl-rm z5|x-E9WjYXQrgjzqNpS%KCwzk;!+m1xJ52@kt|;1l9zx4rZAbwjA6*yn%2}NI1z*) zoAXGW@-#;~?a5Cg2$-N4wMRbg(NPr$nY5%8vp=eAWi0a)t4`%Ab)hPetYXD0Bsob+ zhRRj25}CDVRV`Z;z*xKrmav9JEMq||S<5OI#wKNe15{vOx5AdK5U{NY#LkxCGFLA7 zamYkfpjrI-*e?_It^r_5U(BjN6PmCoSFGX&!n9WaF2#U=5p0;(OqeiZc`JuS%$v%x z*0m7EEN6KvW3(c`01UvfjeRVg1QVplK87hnuK%o4u432AU{*7J$_!FCQ-Di0fRPi> zO(0P?QyPtiG^$mB4TCTP)TTx?idJo+Rmhr~ju5yw@y(-jQ^-}GqBfGAAafr1o!n4B zxWUzpZ(eDs;R-iXuO!ZiLGmYgX8E-fCM|(!3#7%YDY-wI;N&>bx(x} zQ>7Y`P{zcT6QJGf7GTwvTp%U6JId~ul2YQ8)vQ?Q3gnzd1~t544voNsS|C9QO0?xI zaiI$`^ol*bkZ>D^Da`i(8$QL5&#;d{U;7lhna*(LGnIi~WF;Hf{8hGo2*m7ce3KpC z_^*No%q(V|!@dWq@3W^J4hB28TGno`J^y}Lk6%Pc!V#X(w)t71fLJJ?7xvb-{+VHL z8H7XP=5U8QjK+t2SPABmNQgoVVkC-4L?u?YMoh$R6_=!j?M|^r+>PRoz^h&DN)d}- zL~nZ4Yo#?fX$|dd?|P@iRx+0HjAm3*oAk@kH!-9ka7;lA=txIC;W3YZ>SKZp?5LoaZ#Lu58H@V~H!5<>CjXR(1me0Fz_`t5`XqDX#`Jp%qVV#VS|^Wh#rJ0u~Fv z&9p45C1caeFy>~)8dd;reiNMH^#3x(I;pGztaF|0g!9HI#buHSnZk)|g(~vdPd@vT zl|E_7NK8=BzWFR@ZBl4MoyOg!L9L=mlW5hHwnjF->2Dt$+f~R06_TC}ZgG1`+2mFg zzqQn(G=*uYY5Ft9ZH?7B-Dyk<2R52k1R)N&NDG#r2QNfKa}?<`Nd`JqmB_@YP`w?o zr+VzI!X&FeY4%HE_mZ!2AS6i{;=)n|vb?nsa(y0K?kbnOVs9D8 z7$FD^BX95x7BPoC>|*u3@5@Zq-|#aHDl9wj%ZAqA#?dSVJ8SR+KBu(&jt*)i?w#>u zu(cOoEeK-^ACA+uKFYAqZU04X!rzu$LBd5j4U3DzFodP`IIsWOunmQDN8C~&vXr0q@sG#Fj{(%V$oHC60dBT= zSk5Z|H+b^lL9FKn1Cv$_nfYTw%r*uuILJI`!=(xn^v2Gu~;5VV4k#ighx;} zxR8c+d$(hNxB1XGjU%kZz&FFskUIL^{6EW8Z` zdN>GDtmBxt3c4VR!?-lexQ+8T+PaTq7`Zr9A(Nv+14%jITDco?xt1dlnxi=%0;1?j zk({G0B&rcX=>NGt_&J~}x<(WdM}$Q0O1dT)ucnJSD&e}WyF@I>#39MLPXt9K0>!P{ zL^b%j`zjNK$}jlqFaHWExDhb6%ac8MySbw~yTip?{3DbJB$DyPY2mxRyQfmgFh!xT z!7Du3Q$|S&F+JNC#(S3%dzjBVmNA2+E{n!$nHC#kJ( z+L#8o0a0j$WqgHDiLx6om{@wT-NQ!!5C8@Uf!_nZ;JdME88e9?zJ>`WY{ar{Qa(#z zK1)%j=wrxAQ5i&96-mNALfJmZ5bqnh_CyMnkh zO!Fv_D*v1O<3Fg-woqHCo)Q~W^NOA#h!zl>1T>rk%$uU*$)f~7%*hXBm>%f`VK&fngdU8Gy%NH`976UeLc#i;!b-yNVZy?6tSCgx#8eF{v_jd?A1}NOEhIzU=)%f` zOow}*=`hUBDnkl7!wf=0G*rVhGzMIFt-hG8HlzHIW zOC)%NM^I^nBzQ(=fw354n9lpAb4s#)QL<=}l+`mx99y$*L>6)UF>*wh1RcmSvqozf z02^q6RagZmGrUi!Bza5%cd5sF%*Wl^$9^=H-b;Xqp_pvp(9WCC%KNh9YnX_1vxWpx zhMY+23zb*6$Q#H=KKmz*6p4!vzwtYq#G!)YS-&gA(u!IrN@Ei);3yY>$*_4zt5^Zx z87cfbo0=T8v2u!p&`AJ9N}u!tw?P8DiM7HZN{}SVor=>H2&$m6z+e-qsI)e$6#t2; zv`Rx&HmWSaZP~GCJ!ho*Pa@ zEY9R~#7ca`qFYYpe9omSukGYl_wvMltvc!)#jJCK>&&|Bw9cxNx-4NUBk4}>{LU(9 zG_o5{jUosmK)YA`v{-Dr7Z`yTfB_hwMfNNt_k_=r1td#ZrILxTKf=%aT>lqieA)aQ z6%+-~n-!HLI6ZnPvD>52$!xnxH;vPy1cO2# zge7nYDU~%<+f(vOoW}{>pDCOpV9Gy*z+6+CL5)g96$wVI%BxHX+dUlw-CE+R zT6)x4a@0x9TT4X>Og&3*d%>0R)UxU}zhNA=e9JYE%Q>jaOrQk39RCJjaMiu^%UCtS zd!yC!aSUVCx5je9TvgvFoWl9()hiU%_!U;>SgcamjMYe1Gvto&cvfg7P1DSU04AZ- zTuqR}R&BK{ZZ$b?g^(H=E^rN3am~$``$KZAxj=j_oD0qwF~oO`k$9EYDx%jAzSn)F z#CkVuFwR+DipHRAmYyxzO-iLy zx;<{p7&PX*5a@w9rsF#90US`;rB%?!JC;_OS^#AQ>wA?XX#WLK0X$J~rk&l|MShn8 z*p*^oF@r=%g`_+e9VP_j(6-fNOF5Z|q{vTE7j|)(y5*-PbyB_kNJC?jko4R28wR{lMHo80;5bxZ-(moIK!v~H z;DX=?7S}$sU=YdRbY0gC_Fx++PDTv65)R>{b|R%4VG-so7H;8%g%Yi+5*L22>_k|E z{ltQGgRWkK84g8*1taFqDfphF$geCi1`B>LURGe zC7Uvh3S&NjeqK|tN^fn$+y+F-pILz;sDnBXoxb7I%w=W2DroU6sl=EERdUi5C?wXoR;8m?dh5G=@j|RAesbr4FnmX z5kWx2o-67mQtCQaYI<$z?dl>N<`Nv%IzA6rsxJSM_&V6B!|EEo>KMMxu4eQXuHi5G zb1r&V9yTM16_fOH8Y+;2Ra|Sf25^^p#TJ%Hddy4&Q!M(ntAFd%hx zltpY#`On1`<1r5HSZWvsu$g4x;}$!}e&Kc9#_Yx$?Z>lh-lpW@Lx7YaWSh0xVbn0k zZbu^xu@#+dMiu~FITm1-WMCq((2l0wHb}y5^;!Sq>@)7;u9<(r+m0MGga8^(KO8l| zQtOtqhRV{Xp#q}WD8vN=i?tks0B4VKfjYf3sW4OY#!0!c+z+7Ko?$7Tl$={Tg3ldF zZl-4F?r;D8@BDVaU>+M=Yu$n(DRX|(52XJI5u9gZV~MJAXVcN=r81qDr->aKUT?Xo z6wK!gS1I9HUJ+j@9|&l)N~=~YXcWgmxq5_1Xz{#+aUtvr8E+4Kt8p9G@vZ0j#r$#D zFojYG^0EKIV?A=rSPjca`z5c8wMVT2LM`wRkCc{jXk|m$dTA`r@&s-nWbhBa?=3I) z)|{RY3C7JbcP^;^=@Vhs7P*l){{zU!kvXUHNJMHoccM3VgUkPs&Mz-Z^ddk%5*HqQ z(jW92_QXHO&aD2q&A&RY-s%|!>lY>q_@cTn>P{_a8nk|zOULvy!KffEyKMeHxc*a7 zpX(Wzff```8c21$wt!U6BV6P~y{rEeDb`{`;bK_dMZiYcS)V&ju~}RfV?B$Na=$$T z2pHe%y#=6A<8x6=4yS``P{zB_+nYwoJF|r3bse2NfFMxehA37BS-mo-O4N;pNs`>C zATeTvB%&UwYIRUmk^lfcf($8gBuS74Dl{;lvLwrq0T3iefB->(nl%M@Y#A~D&z?G6 z_7osgfK8P~k0Ldi@@RvmP8&?LDC%NEiBGR$&Fa+X0R;>uYzWK2#EBIwjG%pDPql#eg}Y*hPyLD;`6RY*w=56P7Py&U_gK z3lu0ce+Vr)G}+6K&!RocVm1Hk)<%vPSslAI?bNhy%U;WNH*X-mf3pCBHn#BFvuU4Z z5xFsQ=8sL7XaRjX^|01WSkJC~`}PanCtSENVLbWq;>DZyzMTVi>+GpRXFrw$`|jb< zm(Rao!Fc`?7AUY^fcyDZo_b=9^?_!dG1#Dk4?-BBgr2qL+Y?a0g@qe)aEJ*ekbua@ zB$Y%X%`nIybBv0~Bx8(=FT#k8j5E?WV=6b|n4^w6=7)D=nWU0P zmeQn?PeK``luw#crIlA=nWdIna@nPqRi*-_j!oWJN-9p4Y37+^LK)^QZ^9X;oO9Ay zCoXT^87D4#^4X`Ke**s+sGxnin2Vvgu$ZW#i!z#wGLJ$Usic!eN)0uSTAHb*mLkKc zrk!r8=`^E~TB@n1qIxPctFqdvtFJy2tE{umDv7PP;+m_jx<=BgufH-9tgyop8|)%~ zAe*eRe+VMTvTZ;ct+Z@V+eWq2VvDV{*>cOqw%vjoF1X)%`^FpMQmY2K*s9yDx@y21 zue|cEF|WP%!doxC^VYjYzxn#BhQ9*~Jg~tA7kuyxRJ=D@?G$ z`*PedykvkJGRR?&?3c+W`$a_+g0W166j8to^Aj>h!P{)dv9^K=%{3Q;&o9hSgU~|j zP_)rUTaa|p5;6ac(ozIK9d*}hFQPW>DjTKT*MP-pH2ECHD+H14j zw%czf)JhT!x;8gcVK@HWD;XfTdQ~@!?G!sojF%E#@ zL)~2y0S06(iYlKU#0pgva2^rV0YH7y)dNZO`3(eA9yBqIrRC`2U#l8u_AqbOy`OF}ACn$+Z|kTH!=r7D!7RMo3WSxQ== zQdYZKB`YP-t4aLomA)z#ErsQ*V>QcJ$nGvl6c7RRP=Al9Ia39d96=^Bh9p=F*qC%^(ahfbT39fV(k3Z%R;t4){ia zp8}2ngTo0+g2$8JHI66=0Gv!_!aJh=#HcsD+vaYt3XLdaA)})nR3bvto@{O+C{dl( zDu7g-a1Nvlf!$dFAe7xD?yPmIDM+L`yaJ%KcvMSCR*omV1|(q>&x77y3roGOPyqid z8=y{Ej=+VQ?M64>!^>nTdzbQoFMRzZgBZf#zW2e;1@s$j{qSd630=m2|GP}~ID;Dp zAy7FQOilxh;~EG`FtDS%H3mJ6K~ZpQ>3@PKw) z7#<(SP=(Z?&vnLvLmlq0Juk%We~1Xg0TBp>2!an2pXlEAx|TIS*v%BsU|)a5;fh%t zQ8Y^QMHL-GjAJw-jnru19>Foe3SRIVOA(|xLYPW=oG^v;h(YdKk)+Y+WSy=6>gPHUOW+_JTb`OI{&0bW*Cm$lw`FMXMrU-~+j z8h$x2hEWln1BTW%LIv0=65$c$06G=*2!0Awrp}~rN8QQce9~683IG9qV}Mhi z3e~6vuXiUA1y*Ic)v$`S0R-?!08}E8hZI{NNoYb7bYOsMlSCjZy-5EB=n6c{Vb0$+ zZHeMY!fvAiTmX74USXG)wUIWwumdnk^%U^auuP{cEP%}eck`CYf_$==&FoyLKr+Kn zAqtN@f^13aa?_qRLaD_J4lUCl+DM2pwKb>$JFZ*Z-sXb7Eg)l%AchXc4>HZ6OmvVS zv=}ru>Qa9$bTMuM=kCzD;K9!e(GwmOCegbl;O>0J{@w73w}<)xVtLKGpZur?yh+Rq zeCz(iD9-mn7}A0k(z&5II3g3A$iyS~D~)QPXhmZ*27wEFU^Oy0@{*tY935PF4P(B- zn&14D_$bH-uSvro9zE$vY7j6MIADNs>kRJs2ojeBpZ z8w1}}IacK}cATq9{Mc4PhGmd}#fV27xmbc=#3Gu-EF~}N4^iGe_q#mhDvK-1+dLPz z%*BQ+n}3_$Ds#5P>@N3pr+FHv?bHhL zRMA)f)>yzrr39+!+SKe7(_js(#oFh5&a8!$t=XDHteaF#Tvt5=O9fjJ!i_@k8%^0w zO(@&4>A(p1O$IzbP&HKnaFkV$O-fi>TTRvD2vxUvTjl>q6;E(ZE0mk_Yz|1AC`f5ANNeO=WE7AA4aac!*3TiMd;tdurUuTO#bP{$3m^d!gb@8G)Dq|c zA=p6;$N&w<0Mxa>)TL0>RR<5rkac|>bcvlV?jm?47uAUcJBG!1kXPHKmwEZn3?)ct zV20iKpBttR42re|9j6B|s z{75QL9+8|vNRs4|V4j9?UP^9WnuOkzv?S(r7@gEYOp;#d!O7|2!ld$rC6iL zUQjB-rC`dYpvX}kB{iUk?=dB+1RwA{12ha@tQg-aRYD{*->*!CT%69E>}lwFIqRLd}J3;MxjGf~UApdXj5-j-fHUXx+M4$xn-Jw}v%DBZ}s0>{&+CNEJK!G3x?S^g{ zfzaWcXXuY{DU{EopboGg3l;3o z!~htf*|d}rLg(5rAw?KlUENeo_{~HWO|w0l5Geox901uk#46Alyj3R{5{2Z@gzm%@ z@E8>V(9TtDgc{OkD-@eis1)g>6zdRM-RQtB=%EFiC%%0IV0q5x)S+BWRlpUMA|B#{ zhTDQ-P9+)zg(}5fN#a$QT83(c0Z^icTB5}%mMxwJT2R_#sX-&OK^TnU$eE%Vyn%~O zR%f1^E4pIR$zo~cB74yt|71oAbsE%3-7W49E)Eb1#8%HWqca`{0tp>5lAr}eX>K^< z#=T+)Vd-c&26G?*6A%I+=z$*CffxUHqtrFmbZ|!seOJ|0mw2$LdyHLu*w8vAmkw>0 z4YiO9!H|Cx2oaH24S5$o_UJznDrfjWKuYO+LBZbH7aAnw9AE-NW&$Kof+RcxMJAqr z@d<%-q(@TTNS0)%HrRumWR$4nsZN+6oykj(B~luzCpBg7LBps#df!<>mQ}pSr3aF|}ps_KBoiS7Y zsTsC+ddx z*u^OFMLqciDT16q_Jzn@7G01`E50Hu%HnE_){oZQW;lpum;e%lgE$bv4sfG4dZP*u zX@i&+WF*ke@!TgyJ&-63kC<{gI6g?(*^hh)N}QYs}x<%y_B zF1X01HeRQKBuGx)De&)*^slG_Fp)S|t3nB?8t|78@a4f|ht29t&MJq|>YUiBt=?*` zl342D!s@LauL32o2IZ$5YX~E&Cn0OHmI|v(L$f;TvsPs*Q7cxyFt!Flwr*>;c5AeV zD_Rb$VM5HFtzVX9*$?aA_zm%v)n)n}CYC)6x4_?Cwx7bQ!ErU3dK z_ccrbzL_-<%sc?Hf_&mP-#4y|_flm#3>R|wGo zK=Rojve&NF)V|evdRxF@ZSdICNhET3Na#Qh@KnE9 zPV$^pMHupdUW6dxPEa7*7Xk&|+Ev~P58VntUJY&|0&X_{mEaC;C2o%Oj0eVXqU@dp zTe!ud%7sCi3>gT*8?Y$I$>>~Y!CaUO%h>4ex}0p~Ok|KQ36TYLv;YYCC~KK+JBULs zh^d%*0TKVufC_xZX24wjSgG#fMln`t1KsX!O(~V?E?PJi7a+l6cy7yCBNEubNslR+ zHpXK(7Y^Of^>SC$O;_}CM-pA{P3KTdORt`8ZxNB#^lGAL^rOt3!1zi?`644*?43cn zfrns%BY+4bM1rN72pC~x{W6{z;qQ;Y(fS-|R`DCIz;YGlY#4JPuXJ%@na6``uS^Wo1YaMv6QvnFs;E8%l2DF zQ@#H}v6|&;53BYS%O&^iUl%XT#?Xsx@5>lpX2|fJ8lMasPwYU&aiwK+a10%5aI6Ww zCT!~Q9`mu+lvHj8a_aQvZ|We-j&fG<;H)unM9iQ^;B4(Q?IiE)MnJ?xEe_Qt4Gzd= z6SzVXL_{ZtXU?+JbGDQ$ht%03)hVwhAzp3lC=PtSvUHwJ+OUExdxYwE4RH1+NNA^k z4s#3+=ucEY6OgA`o%anmp&2ssgC3iMLNhhvM8FY%094|{(RhV|D28gYHZv!4VpKPK zvjKFn-&{uu2;*>=^X29RU4&UFhTQj5fqn6vQ16i~Ys2rWYVr&3! zV|YQKFEj`>M@yT~OJA?msnAT*^bFzjO)uB-qTO}XRl`QvhTGa^+^TyH6s~A2LE+nqnPU{3M3gerC7?ac8X$yI|(Z*vpTj4LpHRwlC)MU zR$42&$5Lk3@Me=GvNVfnhwA`-w!NpNXy@5(@AkL&D{Zq&aL0DLu#3Tm-);Xl;F(bi zVRD(jLwpYFYr#(O6xRzkiSfdUOq6HlJ*~0IurXjfclTuU1>x?VE6{^1#|fe!48QeigEt}5A#n0wd54a0F7iW^+E+pHd&75hG9j_Op+xlZP6);ESbz=O zKoig>Ls$iXi}KqTgc{D&S!J8#*o1;RGq_m}V8L?F_H3;gv+20nfkFgZ8NftY0MRGS ziC0boh`3XYG#5_7NvMop^M_ifO4N9T=6K}ucmsUsQs5?q zcEwkWD3P0m3lt;cHm;PTOq1&c78E2JaQqZJxdg%m%k(bGdG5+fMhX8uhRs<9dqD>W zAwdfaDw57(3AKP71Oqy>13Ekd@~Xg_$NBw`^K?7EK$iRjO=+Kh^yVr??7LiJOye{n zI?pKjq+{=*!(*g_9r&A23T&DOh+}wl9j0^drgJ)iB+(KT^+OMJsMo(y8>*=v>dyrM zKm>ULWeOB6Yu31lGpA7_NRJp9k`zrEGGxbc88e0p7dDR{Q-u^cl4L4WCsC$6c}gX! zQ!io0lo_*SO`A7y=G2L^6sn%3fCd#hG^nXkrjRC8x|C^Cr%$0KO=T2lNTOGy)nR92)nxBOhJ$kex)2C6VP914dB-gJewSN7YQEl6| zaoZNOn|E*DzW)e%GrSG)Hph_{Pp(|~@HfSsKR?dq_;c#bjWdTHoqPA_+qtv3-bQ?R zHEPzhSz}%e`}1txw-6+*W&ymsbILrB~i?@x52yc{ANLUI7LOSm1#T7}(%|3m%{W zg&Szt;fEoPSmKE(Zs5;~9sbkL0~lanf(bU@Acg-Tbu_|=C#sl2<&{;|qCzc1tU`+j z(O{WnEwI2s<(zYF`Jgq>$WZ8%OXLC!Do{Lviztp@VaOGVe0l{Qh4k@+t4+w-1gy8d z+Uu)@1Uu{#Oh~~CI}SM{k1vRjK?N1Qj$7`z#h#kS8|@bI?ih2N(Qg@_ps_|9O)lJs zBbYuy@x_hMQEI7;M1lqyjyy62tufbn1I#(d-1DqE*P4S3NH5*=(@{^|gwj86y=)|y zu)~YlX-FXjvQ6M%^wcl-*!SOo4?g${OxL~h59t0Hg{y&V{>Qsna2^F8Sn$Dm>;DEK zi0y-b0t%TUOo$IJ0bnWs=o6m|Wr0Nb$^*X=7Otd)f)r$nTI7;J4Z;O49mGpAa949*QiEm&76O+RRgvbXy{ejPW%JW6~gwZ_?GNXOS_@Cu~Cp%a~;u?*kpa#X~ zjPbv?_223}6TY7`PBrE-20gPJ7&taAYzZjm>LW!<|#-wt}yXt!y;# zLLI)~1tPpHd0maF-gY#kAc_BVM}lL45VDunzZs6Lj8kgUSfDtg9u;ava=|4lw*uGg zm9L)LUFrafy3q|bbbU2J3y`n`JJi7owYweejHf#fc%XE>6W(Pp`_T&!k95X^>fDy+ zHA+5@M?P@g^{%H@?rqO|Q;->Y*6@ZoI3g39_yi{?K@n*F!A=tI}EhKD-zVGsd4L?aIPH_suCbJhr;D!OsO*g^1vk;p^| zXJ?D(Q4f9iBOmz8XN>mGo$TZdqy)-aa_LK8 zDrK0=#3fa-sg=@#WiVxFCt4m$%g(|jpmtfTU(Okw!2~ES#niAe@zYYuEZ3lI#=BKQ=h&S zuN!y@QiA%_IoH{WRjguF2L*sb_qEW3BJ`p1qE|(M9c+PZl-R{~7z7#s0SH7O0?Kx_ zvK`=njwxUPA0z)=*1$?qlg6|?EA>!JWfoJMO@U`L#c57qsxm0BK@esLgBZjBRH1@_ zX)d7aNLkRh95L0Yne!^wvNp2GX_W?C{TlNA-BqOSJ9N_#+)oG$!t#AD#)y;}@!48$97|`oL z={j@KPF?M;eS#7ci+ACULGjLAF6HeY2+^Bfz_gd|Ds+rR;;R`K&Ue1{tuKCW=)?Z% zcQ&na=FW19@7C%E#`Bv@||`%Gn&&pOFgx@ zU2uMKw9212l)rh>+%upnh*#zWp<68?ZgehS{=O$?Ui2pZ>UNJeU0fD4GAsEq1risY$2 zD{iQ&1(tvbmY@b=z;;x?1zf=3xF+HLZQ&+KYMSSf_=b^=EaCgq^5F5q5KbU;qzXmN8o?&MGo;6SHy{%QkQ&gFp7cVNyIO@QV?OL-`%tQ-l+ zbj}B2B()$8Mt;tFzQ?7|zzy7B4j7_*CINkeKevY;0J!n`wiKHCq`g)`+b%gu8FD;wr1eRw7OwLHcZ_20){h%aG)=x{? zkCeis%TNhT=C91`k52M0|7dAX?lP6o#moed&hYP8WUvQ^P)vSh01QBvKrsIV=M0vF z>CpHroHE4%A1wnHuuQ;Am(T?>1r3&%h5jBTlypD@Ms1rAKv(>vHfIoA$OT;zGnfDn zQP?HbdaYhEB{*?SUxF=R4hA`oP@$g(!x4&(6S|Qis^KEm=jlK~>gZ=3#nc_ibbs;@AAw>X zp{pM0aVQW79B_%NQ^=JV~Jd~iVVaipAssULqUiyKaMX9 z$RI04#QA`XD^cVtVMO1^a*~+r$*N}ioF{tJGA&o&7`?`J;Bx>p%r3Dc2H7t! z>Gc3aY0Lm~F!fcIO3;?v3{BWXF&A@D1XIm!z+%AVU3%qLk_k`*1vP!?mEfrYIy2EK zkksr&G#Qqhwk1r?q*Mk<)8?d6&P-X>44~{%2eQ*v8ckO+r2xR}Hpi(0XARI?2{T8K zGl_F&iBqDKb2)+5IhzwYrEm(3_Gqi~I(eW6dLTPH#@dp^cBbZ#ScD*KCPQ2c+-_#4 z-mODc1`F1cJLaSzMf+Vz<3=G6Tt2orG_9p*Eq_6teDy$eTuDAdR?(=b4 zKyjk16_3OaU-T7g6tFz&biL+rnyTM+u|_QmNQD%$HmkEZVCHC!dDxOI$2Cd)276@0 z8JkoZpOhM_074=p8@18sGGP)tK}#JYgf;@W%u%>eNp66fDjH7v`5E`t(ofE>Jz_FAQ~1=|a8!A|e-cfD@xp9o2v{ zGBYN%@Swp`?F&;+BZoFsBsH}pA>t%Ol@U&LgO4b}TJ?hq#3i$XDV6AoM$aY@%vM*g zJ~oUfH*EG=_$cvX_|Pc$U<^TcQjHWW^lmuDa#;UCdiYuKNvx)ripNTyHc1oAD$NzNK^s7Ykj+d^eDh%QMWG%|IC=Is1*Ty91ZXQt zXp4<#i#7*xUYby?3km@cyg)Nz17;4ie)mR-x22u*Nq-Kezz03DF%zzo5^_r#Dgzm)mwtmw zezI44$25Pux2T&dd`)30sKOq{H|(0aeA~3T6i6Stt|i>}eYdN-{&9lZ?z`yMEbwfEW(5cIE8>AF(4IzAvJ+DV}a?*foTYWQA6=2c)v!{fRKC_x0oDUlT_KfAQI z=vSfjjwr-zjac~xi7UU7$V$}u$kNFc_ul9Vak-d_<>qoOCu_iX1cY0-T`>L9#EdC` z0@j#~+n7}HWH3+mxzns)ZD~s$=2@IuU>8%8)eKS;Z~`0IGD8-axV!$UiCS1?ksB(T z98Hncdz>n>Pr{@EJmvoG1fW=R*8Zt5*M!Y(zydfq2z0mOrQqB0Ug94 z7-UDQ0)@Y8e!V!p!5r+bPcp|4mM#Ej*b#00varWeb(Yjf!Zd7dQ4S|s|B(k$>OV@eJt#k?#S9Ls-1)M7p)x+@j#U%LA6x%ov>B%u>GCI z8qCFvwI<19vL`!?q(icEmBv`u^)MT=XAg*zLykOKhj$P6Cf>C9qrw=3hN1O5jL-Nw z1S`LJD@jDio*?=}amHoaaL5w37v0RWT+C@+LO;g?I$#8Hez=F*1ufvXw+;a{&JN(O=o?uI47+#|LjvnnUuRemg*0c1!~sN`(Nf|R|NcChHzgl z9K$!f@jJX?J{w-~^C>5QJgM^?-J0;6JYzo<&FI{4M+n*X9wu z<~y3qXFlc1Mg_>VZ)OCN4tmHaw_9@rMIG8{B6@W7Q)~3R&oie5etSkcr?a9qcZvt( z_-d+Fk`0`lK%%AWjHGF%X48gDeuV0K%}L!-o(f1_{ED;>3$VplF0r zMGG2_ZrsShgeemwN|d5SlZFggGGn-6Vw;IAmCc(rQR&>N^OVn@K!XY$O7thHQ#_L@ zUCOkn)2IJCOG%wdwW`%prmku=#kFf!tzg57m5QoVQnNazo~>G|t=qS7$ zbnE8bn-|xum~;Wh989<{VOxlC*(#hkm*dBfBTIg)402`1EtMhD+_JOh&!9t#?hLH7 z>C>m7sb0OhG;3(jU_YBpySDAyvnA=?&AWG`-@hjbpA?C>@koq-GkV0R`Euvbn+uvg zy^(e5f*N7p&b>SLH{ipIA5Xr#`SESqginutefsxr-m`h1o{jzc^V{54qlOKC|NI3g z;C=PsXW)DXu7O~FYc#k<8x7L;AcPS*XrYA^R(N59{5dG#hai4Ph8kp)NJbbarWnSF zRkZ);VvAJ7NJSJgM)8D=PvrQ75j^(jqmK#&DWpOx6lvsTWg1`r0R$M(Km&8yDGDpERBGv^m|Duprkr-VDW82J$|wN=1OULP zsHTc)00u;=C#A1=>gk?@-bpB;6&RrEuDq&RssN>$+Uu~q2GHo7xF(^Bteo;GXc9Ll z`>80nA{%X?h?WX~u%~icYOB$<(h8;GmRo73w7$xUDu~{&%Db-IKxzO209)^`zy|-T z@4nma8|(l82Q2Ww1Q%@Z!2vgr@S_Yj?C`@7GYrAR6i*yM1U6)hLk>Cc;PJ;i^dNE% zqm*27Er{i^2M!@*@W2HdY+&UHMzX-8jv7s&^UfV<;qw$#?7VXr0IGoo8ZJ(O#nMbS zy|flW>zp*uQ^-gK7hFV1ak->c6dR93uwE*0+LK->2{V>#w~Z;E1(c0 z3P(y=H$p;2G~_}K>G*_0e;01}5r}u~bqg)5(0GxIM=tr1j2C&r+n8sbIR~6`F0%QgLBN$NG2wwB+WD}x6p(WPD~YL{`u$ggcMZluh0JbJdril z{9<{<75!6Xg}+v5ndLuOYoUr<21vlR+{G>jtOZ{dsKCAq<}ZgC%wh~9!3o9$F%wML zWH!jb$Xq5Dn#sjzMo7ZXpyq@q1jcJ#;~Lq>1~)LgO>bt%8{pVbIK>IhaDc;{NBGc( z&H-X`n1dbdXlFY|^o|mjD2Veo@rmbwk9wxa9`Mj7KJvkjehx&SEdt0tMe9$14kVxY zlrf9=QG-D+W8K`ObfrnQ&5~7`S?adLrA}G^Ok)xg1r$I^HM!}O2VejL;v^?)*-B4? zDpa9j`6pRIi%yAJ6afa{C}iPjQ<=&XvxW((K0&Jjqhb`dhQ+E#No$zE{1l+B1-y6T8qg?k9V%K%r~o#1RjLL=Yf_zh#kiOi zD|AsyQ8#FUD^?*df0b&N_cEwL_ay*>8317rjVQt*M$w8&tYQ_zSjKF?F_3+1WF#}$ zDB7aI9NkebhC8nvi(Xu7p{7D>kr59j+Bx2UN4s&n>CLjR`Pmp7K-18pz=u(sMICyqDoj3D-Nq6uQ?mEKJP{V@TiJ(D47hlCYtEbEv~fG-nb$Tn=-F z_(SOU5Q#}-qJotO#Rfaric&OVe6UC#`gBn}_VHqVxcHwgYB9qV4snGIq{ax*(L(c? z5QI8Z$2$sWLwSrbe@x^@K-#zpGqRc?ade{`Es~LMO$cHmDYuzjE_FyY@{uRG(j;Gr zlTha52tp~!QI^t_sAQ8WTUn-ezVcbOyjD1EY0Gz(sR6nS057}z%V25>nzJfqIYq@N zMd>P=&8!nThp8!b9_p9tNVFZ;&JzEPwX7{lYlmSpqZ+lr#ySczkcQM` zBrR_)lA*E^v<#&lP;&8FYJ^0NcBVfAs!i3viE~VX4P?OS(V8Z0o&harI(tHmu%@-F zMFDYWqX80Vz;1R+HLgOYoIo~*x|KpH1yo8w3oscaybTF&mYX-0y2`hN070`udPpK4 z667H<5=e`iE9B}b@rg^dNLkt|R+ogiBh#C)u@h|R>g_g~4LRVHG(qPGJ3Giq_T{@1 zZ0GFFB(nx7dClvrXP?LOjZEPRK0BI&QtOCJphObV*q%#ZqTO5AHWg0Mt<;CI6QA^? zw@U$vZ-GnP;yU;1`O_cRksB51F6DpIt*-ytOd~gvkgS~`&15-mDNPbETfXkUH&tk!2Hhk zlNnmrI+UCgH7{`5X<2TDbF&&9>0FVjQD`<#sX{OIH%_1uO`Gy3zQk#&04)t5fQJ@= z%ydns(ki323WFjjjaDmOW+;(@C}{tNYW}xPg=Q?Gwr9kIg47~vdeRD_AWy7PCm?75 zVith>Vk!z{FZBW}0i!5A$V(3;YeIN1wN`7lW-+;zF&x8d9|ck(HBzyFL5@LeCe<Rm~aqBP~J(kKhT9fNehGQ!OG$-6l0cRU=dY26BisC0gYqjKgn+xNLQEH)C}gN20yXE}&9C4dNW8&EqicZ;@@QiH_-gGg{U zhjTfXb2`U7JO@1+aRoqETBiS%TG)dUD1j0pRMtox=e8rbXVMHQ2Wg zhe(O!W6&pkK@yAF=Oo)Vl}KiNNw#t<=Y8L|CE+(p<5zy>$0iD(N~|O&>i0^9(thrD zOLn4`YI$b51c1&oDZ&2)XZ%-8d2&q3^i34VOacH-_r!nucT9BhDt+Q-eJO#8*(;hR z0*^u_UY3E71}d?nmV(A8$Wm#FA}0{2O%)&tt>9_oB$}L(1dMV|>U3uW5Kv`igZjcv z423T{ST6z-gh0qkLztTaqc8(dgcfyc7ZaQt#ZgPxYrZB@!6t0ORvA4Y0wM4+FmqJ{ zF%XRu1&#y+Prwl~^;1Aa27_=3e?SI-gdiWG1x@o2)OHSozy^QBGvFpQ;;A!Ka3f&g z2YvtsSz~VJmNqVc1V~UhN|F#ff;ejvZ%KkBSh;e*bBGM;BzRMB27z)1YSS{ zadlP+cW}c95tskiNQ)#Sk9Y)jMRBZSSB_(G8dph`lvr@XajE!MvXhk~M~iMVan#3E ziS>sn$8x<>J1&QdyQ7PhRY?S=p=jk07Xezr*jdF`j2dADRseK3wFYmHS|pJ@o{)4c zaSX`-7Tf9kOY~iC!~;!s*nsh8@`|jh#(1y@Q@K136(GjnVJX`xnDtqc^qkZ zLxg#cFde0;L+BJvpo~ zW+Ehl1}FcrM?#4rH-?lo!hB1~ls_V%dpLb_LzSeWZU}uTBm=fzK4PXH}pabrTC;nO|v4kz?_kaZOD2f6p*VHNv5P{mVni|Wm zjJ7AH*-Y!#1a}4iG`N1Z;+p<4n>xF*y4kZ3#hbhdFurMPM;M$*xP%?kgd_8WeX2pp zkPOP847AXkF4H^G$x=m92Z;a(V$cOr5H(o9Q%j>WVsHtaFbINF1={uzOrtYua0#BU zo;&~bg+f(RZ%ChFfS>1f1czjYX+v=e@rYTYIC*nq35q(r*o&65pqPa=i})nQBUT9k zaMgEM6pA(~U{**Ekt?~L3tCLdSwOI)5b>nO2vblnrD-@ls5J+e z@Cli~3EHD{(g>zuYK>cWrsP|uX$n7U>ZZ!qj&3=ECxsE+y!3aJPX9KpI#sk%`KydfN%%Bho(2*m#Z z8~|2%qN;frNnqAd!XQ~hs+z*BI(qPddcL|KFifksdXp+i!?TC0zWS`c z-O?`u&@G)=ECw4WEXyaXAPOhDEgy(!sL}x9l$Yx?06D9JJFBzwQZTmZv&R1%w7bbL zy@_VO37i+RQAlf?ON*S|HHAizc@>nwwck$`Hw$yu;{L20fsO!!-pRB#Gk!r;DO@WugZULyA^4I;{9t+&6Nq%hFb?qX5dHrt?^~7`(zuS+=Wen%g(b)4b5zq)ZA0Jtw^z zA*EBAj6#Q6sT1O)i^$6TE1pIb>|Be;mD@#+t$q$K=c1wcJa%O^;_3= z;da+W7l=`h0Q_Bx(bxSb!2W2!ewV<3=L-tFz>Es14*b9o{MeNW!4+HyzmdU~ec6ey zkx20tpJWdalembt-QN^Blq03TUdpKm0|qF*vE)h0?}rS zIft9Zq!VRtOaZrpuH+4tZBj~gY{z{(%3&6-?%HKs=9aQl%8)`$u<~Yv%zqt=D*>3u z*hH|6+{lg$$u{dJ=8}M;EPo-$W`KfBo4l9-+bE*~E)71izT|<(a%Qjp`QQWSOl`S- zvAiszFteH_Dyfoa(=>wpBAYu{04|OIj?A;KX3R8>Fg^%`5F0TN-~c?%;}PHhMyrHL ztF$7+v`zaM*Nn|QV1=~90iyFHUXTcRa0g%DwO=-0RiSPz~La3t%d~WqsD%Za!)Kjcy(8`vcbi)D(7V*XWKw2Sktb*tCHC z?vA0Hf_+|ueZYo|kPWHW`kwCz3BiZ}*^r%IIfU5+AF2lL9D_h$r~2945!#|1k}F(A z;=x9%eZwlbt1@ZZS9IGJmcuSQd%NA+#F|q;Ib$PIB1cTzfFy=H2E|JGd_QJ0hGWG~ zvVB*@ia7t=rBkDbE2G(Z-2&IG!GmOooAYYC#^Sv@tQuXE}F7O3KPy}2s1XAE4@Eo>B z^9Y@A310r?<-9a#5aw90w&>XiZ=eQst1}v5HFDVI&4)NbAXYIgISE0yhc2N#+PlA# zxDX8`+HC^gN^^_8=!5z z#f~KlmMmE)Y1OWUV#V#-D_68=S>wiyoH>p*Wy-{fQZ#AMrXkCf3m2|iiBm0RjLPxj zQ;{W4rd-+bWz3l^Kjz%o^JmbgN_{R>+VpAEsa3CL-P(0(&ah8A9{m_~E!?AU@8;dx z_iy0AZ~3-Wyf|*-$(1i>UcB&g=+UK5myXQ(b?n)-Z^sVI`*-l+#gF$@-u!v=>CGcz zugLv-`0o=tzeef*5{@83Vj|DZ<(VdN420v~BakVXzn5WxclaqvM1Bb0E$3E!ab z!8bD0a6=9`Y~zg&JJhfZ5XjN%C}!Bl8WBe*it%oSMh z>8F%BTFK3u;$&$mI_s2)COqZTb5D=j9O(l{um*I#=RPM82%Sp}6< zQ6LrtSXX})r2>SZZNP>Go-J5bR1FxQS&{`XxqxY@MZj8XD@C9H0S1s+X_-Pj8xCGn=U=q6`xz3{(J977!_HI*I|5Vt}SjH7iktYE$PbS~*R%sZ~iV zSg{gS627%7UH!^e!lEZTLq-6FK}%ZIYFP+G&@>$=L7lyVXRcZyiiZ`8Q|79fx`c+$ zd`48F^9lg6npHFZe^t~|#ro8#(3P%8G+iF8XuLE^Dszd9WXy`z z$yCO&1ym{nAz%Q^bS5;Q1y!g+eEx6{KTqNUb zVN=G~Lht~oye=ihV}TH&U{)zqK?{%@p&DFtO1S|paDyvcT?dyqyR9{DRfrrbsUU{S zg@FrQY6utvdjvD>WONg8!4aZ>*wk%BctYVHo@yt%Kh-WyvXyCgPoS+3R@RI;- zX{O{!aCyd)-f5i|%j!L^d0^_&6R>xLfp}pFOz?t0kl>{*E#$EWSzlu>QW4(@BqHx) zpGI8JTZ#Ptk0fkrNeX_4zt%+)PrroV?E<(auH=MGv^yXIr=maxK1C^Y>fcpVOTp=3 zaD($b3tK+emJs?4ad?>n3jJaUNj#&4hB-_OWe6G^CRo8Zq#+L-EJO%LSi-d-;t-E0 znhKvrH&u;dhdtckD;h^@S|l-6y?Em45T=YPE@K*93?4Sd_&o7J#2eu#M;y;55&YrL ze;DzfM@VRoeFY`$r@o&%P1OBk3RY3PC}_j zWXS8|9;ZrG`t_B-jpdhUsSp;xnR&Pb3U=cpO+4G_b@{V%1fBV3K(`5+!c4DI9JK&M zXH%R1-SnoaND8tFBz0ZqL?^e@xlV_zYGMVIXG$>*u}mAQU-`5tKN;Xp987f=uAt|{ z2%4*LeKXPv9a#WmhA(u9RM!ccX+=|IfM;n`p(Ks8x+1-6i584g;@l`lD+a5Et)dmv zZp97g6@a1Lx>?X_mdW#9_P~U_h19_gOjv?%8$v$En(rXVU0?5*UEcRu5T0m$8 zx#$-SX>db-9RUeQP=XSYV4-ygjF?-P!W0J%&4NvT`pIzS6b^pygkAso*4Rci8CDHd zv-V-!=YBUKE^+TojAG!Aaf~b`z8R76V)Cd_#%y#?jo;(^=f@|F;B9l1FJ33Q|KJz7D$}hhThp0sE18p-mT)^b4A1~P%mA0MnRHt>cl$%3LY9N^HUS_2LZr8PQyF{1 zx1;%|r|LI0&D-_rnE93z|XCj_s6uRYU2qHi_ z=y5ISX)Wy0p6h`+FpxT`ORk2<65uMig5Wyb(gQ-!g+tH-JE#M(6NBFBy5>@!_#vQ> zC<*teh>?&8IoY!mNP)SNlj#zmo`A;GA)d^F9rG#*69l}#n~G!dv-j#m=TSU~Y`n&U zJh`|lG^o5eXoSmygh+@4&VvTevxNe?1sR&5&pBEoz>Kl;i^AAC=N(cEq z@Y~8hVlpIavJ#=P8i_Lcqd!Ut%krbLvRtGdSrJacKToooCW#U)I3+3(Ks2k8EWr}W z36ld1lQ)yIGf9(Mn#Tef2|MGi2%JD+(jN=Nz|C^Vu_6f&>_8T%Ow5#^Kbt$gL&(2V z$P~;b7Hq*z38#*VG^8RYcOj{P^0bIyCy2>GUYVz1u_sRnnRA&bg{i5Vy0;L3fg@bC zCHxj#L8xOXLx(beZIeQEfv7P|7&IJ}c_9E&NfraJfR6c>251;!IZaNgJ~9v zN)|$tPei0QmBF{AYDA}kDyg!)Sg6ph$tp_(n{S{7uQD5iGl8Q^own(ME&xT4lQ@nu z#ZyGZR8+;msW`P-s}l`5Frl0%@WxjfEQCN4o~Vdiv?Z7;NSpIT%pwV#8%99kxz#$x zKs!9%ki{LDoWJUVGeX8OP?wIGR9 zJc|4vxRAVzoP&+*$jl2ck#r%FG%(WZjFlYK8+ytA$cV|%ut`;|NmdP_Bzo1=z_8Jf z#9G*}ChEzb%srvp)!!q^6GMh$KuQ)`Y%KNBFXZ4Q&;Yw*WvLpLS z@%u_^MICRIzmjczzdznLUtCSGH0Uh9hCTIeB>XlZwmEybs zi!!!iQO+O?&wDX|8(0N}A{g^z6^uz1WC4Kx3c%Tt2(Cu7}Gn|Uk zTvvPoD3}5@(>kpSREj9OKQ)tDyv!gauge0)VAQN(ydBD1SmbHa2@*QBpS>BH+2X&WiItOF14Y7ceKZq=pEmQuKOv8UCKwu zvX<4o7A;Qg+3dzVW?!*MDULte%3n@vS|%sBvZ0%&5$C-vh=GzvSg%18dn-wOY<9% z^@HLWVS_cWVo9>%c1;o{(LZ^e3%JTly}VZ&{mXq7%)d`C|H~2_T=Q6f?04&0C8(u5Rd^o*nt@+0S&0z zY{T23;=`MfH?&1i0f#`95| zoiHxkO0Mw5M~`TqMrAwy>{{QZZeM})Q}|tD$CL^~g$hDmNQTrUM}1WOjns;C3&#tg zE3ksYsf)XC1WdR*&Er&Ha3Kah$&`#>yRHmVJ=FszP~l_9g%xJu>xgR?hA|md4`hW899~u(ZdM=WJ|Qmct|ULOq`xRT zS014e^_yZGQ6$!uvK{G>D7#`3Q3DuZ*DW41GNVhsDW$%#SH8U0=e5Q&p52P}*ER05 zfn7|-WMi-Xz?AO9GqGcpUTN%(#*EHmWNec`B~;JMYN*I5OUYP8wlr6n+V1quaw^S| zdKHxYG>M6)TTa>kM$Q+4A?I?2&mjEd1PEmdumMY}>Y z2sUhMHig<+SUxrek0@W`l&6Ij>g*OKt!5c$aS*^mp6WwyZnxC@ zC}-~5XGZaKR_6f6H+L>vc&-|Gp6AEbD#z`Hd(P)f+(fccI^aqxDRAf!Qs@yn=)_S` z&!zIZQBlAd=o6Kk$)N(791bIb#EYzW^{bco1Bwb?q~qEn4< zlX{#8lOUk~=I*l=0N)nqlTZ(d)2c<~)``Ik!SYI=KyIL?V6QrdNJw2gwFv7BqDTOC zi?enM0q(E7$bAO*kv>%Yd}46AlhC~VWPy~Exx zC;DK;_AnA=Z03OM>5y!8w`|PLY|Y;6^(A z-7?s2q!BT{uyk!EqvCHB61Hpux9aU8NzuA2T>!M#dyOS3pe^JM%s5kSf9(nBu0VkW zCh3+;C9TZk5pt2Mey&{Y8FVR-g488w7PXtjd4nOb z8-unuh3;IBgB*|>=qw>Q&C$A-R=^_=gEmD1Q#Y;Dkx~?J0WJ_b7pUD)kMkr=-$uoq zkp}NP*Ygmi+=d%E%k1ZuztYzl6XK#JOGgOqDHDk}Q%INeFKCGJCoZ*NA4TW%i7CNjsDGRgb^IZeQU{0@El!v)apK^K6)RY{IKtu~M2JQvPCR1qVnl^3P$2xk;p2vo z7dBj&FyTT;lPXuLM2RwF$d3hQB0Pa2B9NRxfmUqxW?YPg)J3Yw5ZmyMRn>e+_-Y*(yeRvuHCk8+p>*I zs_oykr3Mo&Z1^zZ#EKU)RxEfhsmPKOkE(3>a;?mxYE{nc`7`LyqDOnSmDv_*)U{Hx zZtePYuGq3?)2=Q1*s<8SaU(kh_BU|gz4l;}J7@Z!M_DsTS$c|n32sc-N8J^c9c-@mE@Gg8|p7IxV%iri(4R?Ydj5sud(!!MX(8pvtnWG+L~v%(jxm zwC=8|tE{^oV8I9sEbssZ7=ZBb!yjPaK?xx+@GHgx{5k-~9eeyS$RU4>G07McFfFV?%`n7Fv}5T{hfW)U5@JQ|JwL z6?;!11r=b3F*p}dL~%q#Q523iMMogFlB;Dshio>;D)L=0u!0w zgeN@Fm1%$_He|U)T2jatx8S9PE_`7N*Af@L%*8D-JVj*x9@Cf|^00?Id<tdDWVgR0V-jD(Trx4qgCFBYpxX1@hAeO^U)H0 z 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

wFvQ)BXXfQM6ONm{CfgnkllU(tDD!_Jq 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