From f3915d1583a80f8abf4550c1b3e57c09f79e31cb Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 24 Aug 2018 16:53:29 -0700 Subject: [PATCH 1/5] better clean script. deletes EVERYTHING except src files --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 77edd510b..47d7403a7 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ "scripts": { "lint": "xo", "test": "lerna run test --stream", - "clean": "lerna clean --yes && rm -rf node_modules", - "build": "lerna run build --stream", + "clean": "lerna clean --yes && rm -rf node_modules && npm run clean:build", + "clean:build": "rm -rf packages/**/es packages/**/dist", + "build": "npm run clean:build && lerna run build --stream", "build:watch": "lerna run build:watch --parallel" }, "devDependencies": { @@ -28,8 +29,8 @@ "lerna": "^3.1.1", "lint-staged": "^7.2.2", "prettier": "^1.14.2", - "source-map-support": "^0.5.8", "should": "^13.2.3", + "source-map-support": "^0.5.8", "tfilter": "^1.0.1", "xo": "^0.22.0" }, From 6484a24b46d4753257e546a9d38956a60e4e5356 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 24 Aug 2018 16:53:29 -0700 Subject: [PATCH 2/5] correct versions --- packages/core/package.json | 2 +- packages/custom/package.json | 2 +- packages/jimp/jimp.d.ts | 547 +++++++++++++++++++++++++ packages/plugin-blit/package.json | 2 +- packages/plugin-blur/package.json | 2 +- packages/plugin-color/package.json | 2 +- packages/plugin-contain/package.json | 8 +- packages/plugin-cover/package.json | 6 +- packages/plugin-crop/package.json | 2 +- packages/plugin-displace/package.json | 2 +- packages/plugin-dither/package.json | 2 +- packages/plugin-flip/package.json | 4 +- 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 | 4 +- packages/type-bmp/package.json | 2 +- packages/type-gif/package.json | 2 +- packages/type-jpeg/package.json | 2 +- packages/type-png/package.json | 2 +- 24 files changed, 577 insertions(+), 30 deletions(-) create mode 100644 packages/jimp/jimp.d.ts diff --git a/packages/core/package.json b/packages/core/package.json index ed855fac2..9f9e51d86 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -33,7 +33,7 @@ "author": "Oliver Moran ", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "any-base": "^1.1.0", "buffer": "^5.2.0", "exif-parser": "^0.1.12", diff --git a/packages/custom/package.json b/packages/custom/package.json index 4385f97d1..c5c655fbf 100644 --- a/packages/custom/package.json +++ b/packages/custom/package.json @@ -16,6 +16,6 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/core": "^0.3.4" + "@jimp/core": "^0.3.5" } } diff --git a/packages/jimp/jimp.d.ts b/packages/jimp/jimp.d.ts new file mode 100644 index 000000000..2eef307c9 --- /dev/null +++ b/packages/jimp/jimp.d.ts @@ -0,0 +1,547 @@ +declare namespace Jimp { + type GenericCallback = ( + this: TThis, + err: Error | null, + value: T + ) => U; + type ImageCallback = GenericCallback; + 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 = + | string + | { + text: string; + alignmentX: number; + alignmentY: number; + }; + + interface Bitmap { + data: Buffer; + width: number; + height: number; + } + interface RGB { + r: number; + g: number; + b: number; + } + interface RGBA { + r: number; + g: number; + b: number; + a: number; + } + + interface FontChar { + id: number; + x: number; + y: number; + width: number; + height: number; + xoffset: number; + yoffset: number; + xadvance: number; + page: number; + chnl: number; + } + + 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]; + } + + 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; + } + + class Jimp { + // Constants + static AUTO: -1; + + // supported mime types + static MIME_PNG: 'image/png'; + static MIME_TIFF: 'image/tiff'; + static MIME_JPEG: 'image/jpeg'; + static MIME_JGD: 'image/jgd'; + static MIME_BMP: 'image/bmp'; + static MIME_X_MS_BMP: 'image/x-ms-bmp'; + static MIME_GIF: 'image/gif'; + // PNG filter types + static PNG_FILTER_AUTO: -1; + static PNG_FILTER_NONE: 0; + static PNG_FILTER_SUB: 1; + static PNG_FILTER_UP: 2; + static PNG_FILTER_AVERAGE: 3; + static PNG_FILTER_PATH: 4; + + // resize methods + static RESIZE_NEAREST_NEIGHBOR: 'nearestNeighbor'; + static RESIZE_BILINEAR: 'bilinearInterpolation'; + static RESIZE_BICUBIC: 'bicubicInterpolation'; + static RESIZE_HERMITE: 'hermiteInterpolation'; + static RESIZE_BEZIER: 'bezierInterpolation'; + + // blend modes + static BLEND_SOURCE_OVER: string; + static BLEND_DESTINATION_OVER: string; + static BLEND_MULTIPLY: string; + static BLEND_SCREEN: string; + static BLEND_OVERLAY: string; + static BLEND_DARKEN: string; + static BLEND_LIGHTEN: string; + static BLEND_HARDLIGHT: string; + static BLEND_DIFFERENCE: string; + static BLEND_EXCLUSION: string; + + // Align modes for cover, contain, bit masks + static HORIZONTAL_ALIGN_LEFT: 1; + static HORIZONTAL_ALIGN_CENTER: 2; + static HORIZONTAL_ALIGN_RIGHT: 4; + + static VERTICAL_ALIGN_TOP: 8; + static VERTICAL_ALIGN_MIDDLE: 16; + static VERTICAL_ALIGN_BOTTOM: 32; + + // Font locations + static FONT_SANS_8_BLACK: string; + static FONT_SANS_10_BLACK: string; + static FONT_SANS_12_BLACK: string; + static FONT_SANS_14_BLACK: string; + static FONT_SANS_16_BLACK: string; + static FONT_SANS_32_BLACK: string; + static FONT_SANS_64_BLACK: string; + static FONT_SANS_128_BLACK: string; + + static FONT_SANS_8_WHITE: string; + static FONT_SANS_16_WHITE: string; + static FONT_SANS_32_WHITE: string; + static FONT_SANS_64_WHITE: string; + static FONT_SANS_128_WHITE: string; + + // Edge Handling + static EDGE_EXTEND: 1; + static EDGE_WRAP: 2; + static EDGE_CROP: 3; + + // Properties + bitmap: Bitmap; + + private _quality: number; + private _deflateLevel: number; + private _deflateStrategy: number; + private _filterType: number; + private _rgba: boolean; + private _background: number; + private _originalMime: string; + + // Constructors + constructor(path: string, cb?: Jimp.ImageCallback); + constructor(image: Jimp, cb?: Jimp.ImageCallback); + constructor(data: Buffer, cb?: Jimp.ImageCallback); + constructor(data: Bitmap, cb?: Jimp.ImageCallback); + constructor(w: number, h: number, cb?: Jimp.ImageCallback); + constructor( + w: number, + h: number, + background?: number, + cb?: Jimp.ImageCallback + ); + constructor( + w: number, + h: number, + background?: string, + cb?: Jimp.ImageCallback + ); + // For custom constructors when using Jimp.appendConstructorOption + constructor(...args: any[]); + + // Methods + on( + event: T, + cb: (data: ListenerData) => any + ): any; + getHeight(): number; + getWidth(): number; + inspect(): string; + toString(): string; + getMIME(): string; + getExtension(): string; + write(path: string, cb?: Jimp.ImageCallback): this; + writeAsync(path: string): Promise; + deflateLevel(l: number, cb?: Jimp.ImageCallback): this; + deflateStrategy(s: number, cb?: Jimp.ImageCallback): this; + filterType(f: number, cb?: Jimp.ImageCallback): this; + rgba(bool: boolean, cb?: Jimp.ImageCallback): this; + quality(n: number, cb?: Jimp.ImageCallback): this; + getBase64(mime: string, cb: GenericCallback): this; + getBase64Async(mime: string): Promise; + hash(cb?: GenericCallback): this; + hash( + base: number | null | undefined, + cb?: GenericCallback + ): this; + getBuffer(mime: string, cb: GenericCallback): this; + getBufferAsync(mime: string): Promise; + getPixelIndex( + x: number, + y: number, + cb?: GenericCallback + ): this; + getPixelIndex( + x: number, + y: number, + edgeHandling: string, + cb?: GenericCallback + ): this; + getPixelColor( + x: number, + y: number, + cb?: GenericCallback + ): this; + getPixelColour( + x: number, + y: number, + cb?: GenericCallback + ): this; + setPixelColor( + hex: number, + x: number, + y: number, + cb?: Jimp.ImageCallback + ): this; + setPixelColour( + hex: number, + x: number, + y: number, + cb?: Jimp.ImageCallback + ): this; + clone(cb?: Jimp.ImageCallback): this; + cloneQuiet(cb?: Jimp.ImageCallback): this; + background(hex: number, cb?: Jimp.ImageCallback): this; + backgroundQuiet(hex: number, cb?: Jimp.ImageCallback): this; + scan( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: Jimp.ImageCallback + ): this; + scanQuiet( + x: number, + y: number, + w: number, + h: number, + f: (this: this, x: number, y: number, idx: number) => any, + cb?: Jimp.ImageCallback + ): this; + crop( + x: number, + y: number, + w: number, + h: number, + cb?: Jimp.ImageCallback + ): this; + cropQuiet( + x: number, + y: number, + w: number, + h: number, + cb?: Jimp.ImageCallback + ): this; + + // Color methods + brightness(val: number, cb?: Jimp.ImageCallback): this; + contrast(val: number, cb?: Jimp.ImageCallback): this; + posterize(n: number, cb?: Jimp.ImageCallback): this; + greyscale(cb?: Jimp.ImageCallback): this; + grayscale(cb?: Jimp.ImageCallback): this; + opacity(f: number, cb?: Jimp.ImageCallback): this; + sepia(cb?: Jimp.ImageCallback): this; + fade(f: number, cb?: Jimp.ImageCallback): this; + convolution(kernel: number[][], cb?: Jimp.ImageCallback): this; + convolution( + kernel: number[][], + edgeHandling: string, + cb?: Jimp.ImageCallback + ): this; + opaque(cb?: Jimp.ImageCallback): this; + pixelate(size: number, cb?: Jimp.ImageCallback): this; + pixelate( + size: number, + x: number, + y: number, + w: number, + h: number, + cb?: Jimp.ImageCallback + ): this; + convolute(kernel: number[][], cb?: Jimp.ImageCallback): this; + convolute( + kernel: number[][], + x: number, + y: number, + w: number, + h: number, + cb?: Jimp.ImageCallback + ): this; + color(actions: ColorAction[], cb?: Jimp.ImageCallback): this; + colour(actions: ColorAction[], cb?: Jimp.ImageCallback): this; + + // Shape methods + rotate(deg: number, cb?: Jimp.ImageCallback): this; + rotate( + deg: number, + mode: string | boolean, + cb?: Jimp.ImageCallback + ): this; + flip( + horizontal: boolean, + vertical: boolean, + cb?: Jimp.ImageCallback + ): this; + mirror( + horizontal: boolean, + vertical: boolean, + cb?: Jimp.ImageCallback + ): this; + resize(w: number, h: number, cb?: Jimp.ImageCallback): this; + resize( + w: number, + h: number, + mode?: string, + cb?: Jimp.ImageCallback + ): this; + cover(w: number, h: number, cb?: Jimp.ImageCallback): this; + cover( + w: number, + h: number, + alignBits?: number, + cb?: Jimp.ImageCallback + ): this; + cover( + w: number, + h: number, + alignBits?: number, + mode?: string, + cb?: Jimp.ImageCallback + ): this; + contain(w: number, h: number, cb?: Jimp.ImageCallback): this; + contain( + w: number, + h: number, + mode?: string, + cb?: Jimp.ImageCallback + ): this; + contain( + w: number, + h: number, + alignBits?: number, + cb?: Jimp.ImageCallback + ): this; + contain( + w: number, + h: number, + alignBits?: number, + mode?: string, + cb?: Jimp.ImageCallback + ): this; + scale(f: number, cb?: Jimp.ImageCallback): this; + scale(f: number, mode?: string, cb?: Jimp.ImageCallback): this; + scaleToFit(w: number, h: number, cb?: Jimp.ImageCallback): this; + scaleToFit( + w: number, + h: number, + mode?: string, + cb?: Jimp.ImageCallback + ): this; + displace(map: Jimp, offset: number, cb?: Jimp.ImageCallback): this; + autocrop(tolerance?: number, cb?: Jimp.ImageCallback): this; + autocrop(cropOnlyFrames?: boolean, cb?: Jimp.ImageCallback): this; + autocrop( + tolerance?: number, + cropOnlyFrames?: boolean, + cb?: Jimp.ImageCallback + ): this; + + // Text methods + print( + font: Font, + x: number, + y: number, + text: PrintableText, + cb?: Jimp.ImageCallback + ): this; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + cb?: Jimp.ImageCallback + ): this; + print( + font: Font, + x: number, + y: number, + text: PrintableText, + maxWidth?: number, + maxHeight?: number, + cb?: Jimp.ImageCallback + ): this; + + // Effect methods + blur(r: number, cb?: Jimp.ImageCallback): this; + dither565(cb?: Jimp.ImageCallback): this; + dither16(cb?: Jimp.ImageCallback): this; + histogram(): { r: number[]; g: number[]; b: number[] }; + normalize(cb?: Jimp.ImageCallback): this; + invert(cb?: Jimp.ImageCallback): this; + gaussian(r: number, cb?: Jimp.ImageCallback): this; + composite( + src: Jimp, + x: number, + y: number, + options?: Jimp.BlendMode, + cb?: Jimp.ImageCallback + ): this; + blit(src: Jimp, x: number, y: number, cb?: Jimp.ImageCallback): this; + blit( + src: Jimp, + x: number, + y: number, + srcx: number, + srcy: number, + srcw: number, + srch: number, + cb?: Jimp.ImageCallback + ): this; + mask(src: Jimp, x: number, y: number, cb?: Jimp.ImageCallback): this; + + // Functions + static appendConstructorOption( + name: string, + test: (...args: T[]) => boolean, + run: ( + this: Jimp, + resolve: (jimp: Jimp) => any, + reject: (reason: Error) => any, + ...args: T[] + ) => any + ); + static read(path: string): Promise; + static read(image: Jimp): Promise; + static read(data: Buffer): Promise; + static read(w: number, h: number, background?: number): Promise; + static create(path: string): Promise; + static create(image: Jimp): Promise; + static create(data: Buffer): Promise; + static create(w: number, h: number, background?: number): Promise; + static rgbaToInt( + r: number, + g: number, + b: number, + a: number, + cb: GenericCallback + ): number; + static intToRGBA(i: number, cb?: GenericCallback): Jimp.RGBA; + static cssColorToHex(cssColor: string): number; + static limit255(n: number): number; + static diff( + img1: Jimp, + img2: Jimp, + threshold?: number + ): { percent: number; image: Jimp }; + static distance(img1: Jimp, img2: Jimp): number; + static colorDiff(rgba1: Jimp.RGB, rgba2: Jimp.RGB): number; + static colorDiff(rgba1: Jimp.RGBA, rgba2: Jimp.RGBA): number; + static loadFont(file: string): Promise; + static loadFont( + file: string, + cb: Jimp.GenericCallback + ): Promise; + static measureText(font: Font, text: PrintableText); + static measureTextHeight( + font: Font, + text: PrintableText, + maxWidth: number + ); + } +} + +declare module 'jimp' { + export = Jimp.Jimp; +} diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index 2e48a184d..a1dac78f8 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json index 7a0a4588d..06defc780 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json index 7b02905f1..90c03c134 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "tinycolor2": "^1.4.1" }, "peerDependencies": { diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json index 5b01367bf..ecfd849f9 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -15,12 +15,12 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { - "@jimp/plugin-sca;e": "^0.3.4", - "@jimp/plugin-resize": "^0.3.4", - "@jimp/plugin-blit": "^0.3.4", + "@jimp/plugin-scale": "^0.3.5", + "@jimp/plugin-resize": "^0.3.5", + "@jimp/plugin-blit": "^0.3.5", "jimp": "0.3.5" } } diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json index 3140f3ec8..2a39bee7b 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -15,11 +15,11 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { - "@jimp/plugin-crop": "^0.3.4", - "@jimp/plugin-scale": "^0.3.4", + "@jimp/plugin-crop": "^0.3.5", + "@jimp/plugin-scale": "^0.3.5", "jimp": "0.3.5" } } diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json index 28d51e5e8..bd16df6d6 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json index f6d4f088c..eadc5b19a 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json index 3c738714d..ec227439d 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 7881391c1..45cad094b 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -15,10 +15,10 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { - "@jimp/rotate": "^0.3.4", + "@jimp/plugin-rotate": "^0.3.5", "jimp": "0.3.5" } } diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json index eea2caf64..5d9018346 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json index cc48c374e..258ceb6e2 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json index ffb5875b4..7568f8fc6 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json index 1f29097ce..87a0cc9da 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json index 0e63848aa..3fce6c01b 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "load-bmfont": "^1.3.1" }, "peerDependencies": { diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json index d307a6527..dec04f7b2 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5" diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json index 79db3c67f..d9b4159ad 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { "jimp": "0.3.5", diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json index b929f4a4d..d39f8e468 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -15,10 +15,10 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4" + "@jimp/utils": "^0.3.5" }, "peerDependencies": { - "@jimp/resize": "^0.3.4", + "@jimp/plugin-resize": "^0.3.5", "jimp": "0.3.5" } } diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index e03b2c11c..69192f0f6 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "bmp-js": "^0.1.0" }, "peerDependencies": { diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json index 43d571c9e..8513d175d 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "omggif": "^1.0.9" }, "peerDependencies": { diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json index 563199c8f..b28b4215a 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "jpeg-js": "^0.3.4" }, "peerDependencies": { diff --git a/packages/type-png/package.json b/packages/type-png/package.json index 058b65647..b749300d5 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -15,7 +15,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "pngjs": "^3.3.3" }, "peerDependencies": { From c635741ab9fd9815c0ef49a5b55510fc23306fef Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 24 Aug 2018 18:13:27 -0700 Subject: [PATCH 3/5] add module builds --- packages/core/jimp.d.ts | 547 ------------------------- packages/core/package.json | 4 +- packages/jimp/package.json | 7 +- packages/plugin-blit/package.json | 1 + packages/plugin-blur/package.json | 1 + packages/plugin-color/package.json | 1 + packages/plugin-contain/package.json | 1 + packages/plugin-cover/package.json | 1 + packages/plugin-crop/package.json | 1 + packages/plugin-displace/package.json | 1 + packages/plugin-dither/package.json | 1 + packages/plugin-flip/package.json | 1 + packages/plugin-gaussian/package.json | 1 + packages/plugin-invert/package.json | 1 + packages/plugin-mask/package.json | 1 + packages/plugin-normalize/package.json | 1 + packages/plugin-print/package.json | 1 + packages/plugin-resize/package.json | 1 + packages/plugin-rotate/package.json | 1 + packages/plugin-scale/package.json | 1 + packages/type-bmp/package.json | 1 + packages/type-gif/package.json | 1 + packages/type-jpeg/package.json | 1 + packages/type-png/package.json | 1 + packages/type-tiff/package.json | 1 + packages/utils/package.json | 1 + 26 files changed, 29 insertions(+), 552 deletions(-) delete mode 100644 packages/core/jimp.d.ts diff --git a/packages/core/jimp.d.ts b/packages/core/jimp.d.ts deleted file mode 100644 index 2eef307c9..000000000 --- a/packages/core/jimp.d.ts +++ /dev/null @@ -1,547 +0,0 @@ -declare namespace Jimp { - type GenericCallback = ( - this: TThis, - err: Error | null, - value: T - ) => U; - type ImageCallback = GenericCallback; - 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 = - | string - | { - text: string; - alignmentX: number; - alignmentY: number; - }; - - interface Bitmap { - data: Buffer; - width: number; - height: number; - } - interface RGB { - r: number; - g: number; - b: number; - } - interface RGBA { - r: number; - g: number; - b: number; - a: number; - } - - interface FontChar { - id: number; - x: number; - y: number; - width: number; - height: number; - xoffset: number; - yoffset: number; - xadvance: number; - page: number; - chnl: number; - } - - 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]; - } - - 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; - } - - class Jimp { - // Constants - static AUTO: -1; - - // supported mime types - static MIME_PNG: 'image/png'; - static MIME_TIFF: 'image/tiff'; - static MIME_JPEG: 'image/jpeg'; - static MIME_JGD: 'image/jgd'; - static MIME_BMP: 'image/bmp'; - static MIME_X_MS_BMP: 'image/x-ms-bmp'; - static MIME_GIF: 'image/gif'; - // PNG filter types - static PNG_FILTER_AUTO: -1; - static PNG_FILTER_NONE: 0; - static PNG_FILTER_SUB: 1; - static PNG_FILTER_UP: 2; - static PNG_FILTER_AVERAGE: 3; - static PNG_FILTER_PATH: 4; - - // resize methods - static RESIZE_NEAREST_NEIGHBOR: 'nearestNeighbor'; - static RESIZE_BILINEAR: 'bilinearInterpolation'; - static RESIZE_BICUBIC: 'bicubicInterpolation'; - static RESIZE_HERMITE: 'hermiteInterpolation'; - static RESIZE_BEZIER: 'bezierInterpolation'; - - // blend modes - static BLEND_SOURCE_OVER: string; - static BLEND_DESTINATION_OVER: string; - static BLEND_MULTIPLY: string; - static BLEND_SCREEN: string; - static BLEND_OVERLAY: string; - static BLEND_DARKEN: string; - static BLEND_LIGHTEN: string; - static BLEND_HARDLIGHT: string; - static BLEND_DIFFERENCE: string; - static BLEND_EXCLUSION: string; - - // Align modes for cover, contain, bit masks - static HORIZONTAL_ALIGN_LEFT: 1; - static HORIZONTAL_ALIGN_CENTER: 2; - static HORIZONTAL_ALIGN_RIGHT: 4; - - static VERTICAL_ALIGN_TOP: 8; - static VERTICAL_ALIGN_MIDDLE: 16; - static VERTICAL_ALIGN_BOTTOM: 32; - - // Font locations - static FONT_SANS_8_BLACK: string; - static FONT_SANS_10_BLACK: string; - static FONT_SANS_12_BLACK: string; - static FONT_SANS_14_BLACK: string; - static FONT_SANS_16_BLACK: string; - static FONT_SANS_32_BLACK: string; - static FONT_SANS_64_BLACK: string; - static FONT_SANS_128_BLACK: string; - - static FONT_SANS_8_WHITE: string; - static FONT_SANS_16_WHITE: string; - static FONT_SANS_32_WHITE: string; - static FONT_SANS_64_WHITE: string; - static FONT_SANS_128_WHITE: string; - - // Edge Handling - static EDGE_EXTEND: 1; - static EDGE_WRAP: 2; - static EDGE_CROP: 3; - - // Properties - bitmap: Bitmap; - - private _quality: number; - private _deflateLevel: number; - private _deflateStrategy: number; - private _filterType: number; - private _rgba: boolean; - private _background: number; - private _originalMime: string; - - // Constructors - constructor(path: string, cb?: Jimp.ImageCallback); - constructor(image: Jimp, cb?: Jimp.ImageCallback); - constructor(data: Buffer, cb?: Jimp.ImageCallback); - constructor(data: Bitmap, cb?: Jimp.ImageCallback); - constructor(w: number, h: number, cb?: Jimp.ImageCallback); - constructor( - w: number, - h: number, - background?: number, - cb?: Jimp.ImageCallback - ); - constructor( - w: number, - h: number, - background?: string, - cb?: Jimp.ImageCallback - ); - // For custom constructors when using Jimp.appendConstructorOption - constructor(...args: any[]); - - // Methods - on( - event: T, - cb: (data: ListenerData) => any - ): any; - getHeight(): number; - getWidth(): number; - inspect(): string; - toString(): string; - getMIME(): string; - getExtension(): string; - write(path: string, cb?: Jimp.ImageCallback): this; - writeAsync(path: string): Promise; - deflateLevel(l: number, cb?: Jimp.ImageCallback): this; - deflateStrategy(s: number, cb?: Jimp.ImageCallback): this; - filterType(f: number, cb?: Jimp.ImageCallback): this; - rgba(bool: boolean, cb?: Jimp.ImageCallback): this; - quality(n: number, cb?: Jimp.ImageCallback): this; - getBase64(mime: string, cb: GenericCallback): this; - getBase64Async(mime: string): Promise; - hash(cb?: GenericCallback): this; - hash( - base: number | null | undefined, - cb?: GenericCallback - ): this; - getBuffer(mime: string, cb: GenericCallback): this; - getBufferAsync(mime: string): Promise; - getPixelIndex( - x: number, - y: number, - cb?: GenericCallback - ): this; - getPixelIndex( - x: number, - y: number, - edgeHandling: string, - cb?: GenericCallback - ): this; - getPixelColor( - x: number, - y: number, - cb?: GenericCallback - ): this; - getPixelColour( - x: number, - y: number, - cb?: GenericCallback - ): this; - setPixelColor( - hex: number, - x: number, - y: number, - cb?: Jimp.ImageCallback - ): this; - setPixelColour( - hex: number, - x: number, - y: number, - cb?: Jimp.ImageCallback - ): this; - clone(cb?: Jimp.ImageCallback): this; - cloneQuiet(cb?: Jimp.ImageCallback): this; - background(hex: number, cb?: Jimp.ImageCallback): this; - backgroundQuiet(hex: number, cb?: Jimp.ImageCallback): this; - scan( - x: number, - y: number, - w: number, - h: number, - f: (this: this, x: number, y: number, idx: number) => any, - cb?: Jimp.ImageCallback - ): this; - scanQuiet( - x: number, - y: number, - w: number, - h: number, - f: (this: this, x: number, y: number, idx: number) => any, - cb?: Jimp.ImageCallback - ): this; - crop( - x: number, - y: number, - w: number, - h: number, - cb?: Jimp.ImageCallback - ): this; - cropQuiet( - x: number, - y: number, - w: number, - h: number, - cb?: Jimp.ImageCallback - ): this; - - // Color methods - brightness(val: number, cb?: Jimp.ImageCallback): this; - contrast(val: number, cb?: Jimp.ImageCallback): this; - posterize(n: number, cb?: Jimp.ImageCallback): this; - greyscale(cb?: Jimp.ImageCallback): this; - grayscale(cb?: Jimp.ImageCallback): this; - opacity(f: number, cb?: Jimp.ImageCallback): this; - sepia(cb?: Jimp.ImageCallback): this; - fade(f: number, cb?: Jimp.ImageCallback): this; - convolution(kernel: number[][], cb?: Jimp.ImageCallback): this; - convolution( - kernel: number[][], - edgeHandling: string, - cb?: Jimp.ImageCallback - ): this; - opaque(cb?: Jimp.ImageCallback): this; - pixelate(size: number, cb?: Jimp.ImageCallback): this; - pixelate( - size: number, - x: number, - y: number, - w: number, - h: number, - cb?: Jimp.ImageCallback - ): this; - convolute(kernel: number[][], cb?: Jimp.ImageCallback): this; - convolute( - kernel: number[][], - x: number, - y: number, - w: number, - h: number, - cb?: Jimp.ImageCallback - ): this; - color(actions: ColorAction[], cb?: Jimp.ImageCallback): this; - colour(actions: ColorAction[], cb?: Jimp.ImageCallback): this; - - // Shape methods - rotate(deg: number, cb?: Jimp.ImageCallback): this; - rotate( - deg: number, - mode: string | boolean, - cb?: Jimp.ImageCallback - ): this; - flip( - horizontal: boolean, - vertical: boolean, - cb?: Jimp.ImageCallback - ): this; - mirror( - horizontal: boolean, - vertical: boolean, - cb?: Jimp.ImageCallback - ): this; - resize(w: number, h: number, cb?: Jimp.ImageCallback): this; - resize( - w: number, - h: number, - mode?: string, - cb?: Jimp.ImageCallback - ): this; - cover(w: number, h: number, cb?: Jimp.ImageCallback): this; - cover( - w: number, - h: number, - alignBits?: number, - cb?: Jimp.ImageCallback - ): this; - cover( - w: number, - h: number, - alignBits?: number, - mode?: string, - cb?: Jimp.ImageCallback - ): this; - contain(w: number, h: number, cb?: Jimp.ImageCallback): this; - contain( - w: number, - h: number, - mode?: string, - cb?: Jimp.ImageCallback - ): this; - contain( - w: number, - h: number, - alignBits?: number, - cb?: Jimp.ImageCallback - ): this; - contain( - w: number, - h: number, - alignBits?: number, - mode?: string, - cb?: Jimp.ImageCallback - ): this; - scale(f: number, cb?: Jimp.ImageCallback): this; - scale(f: number, mode?: string, cb?: Jimp.ImageCallback): this; - scaleToFit(w: number, h: number, cb?: Jimp.ImageCallback): this; - scaleToFit( - w: number, - h: number, - mode?: string, - cb?: Jimp.ImageCallback - ): this; - displace(map: Jimp, offset: number, cb?: Jimp.ImageCallback): this; - autocrop(tolerance?: number, cb?: Jimp.ImageCallback): this; - autocrop(cropOnlyFrames?: boolean, cb?: Jimp.ImageCallback): this; - autocrop( - tolerance?: number, - cropOnlyFrames?: boolean, - cb?: Jimp.ImageCallback - ): this; - - // Text methods - print( - font: Font, - x: number, - y: number, - text: PrintableText, - cb?: Jimp.ImageCallback - ): this; - print( - font: Font, - x: number, - y: number, - text: PrintableText, - maxWidth?: number, - cb?: Jimp.ImageCallback - ): this; - print( - font: Font, - x: number, - y: number, - text: PrintableText, - maxWidth?: number, - maxHeight?: number, - cb?: Jimp.ImageCallback - ): this; - - // Effect methods - blur(r: number, cb?: Jimp.ImageCallback): this; - dither565(cb?: Jimp.ImageCallback): this; - dither16(cb?: Jimp.ImageCallback): this; - histogram(): { r: number[]; g: number[]; b: number[] }; - normalize(cb?: Jimp.ImageCallback): this; - invert(cb?: Jimp.ImageCallback): this; - gaussian(r: number, cb?: Jimp.ImageCallback): this; - composite( - src: Jimp, - x: number, - y: number, - options?: Jimp.BlendMode, - cb?: Jimp.ImageCallback - ): this; - blit(src: Jimp, x: number, y: number, cb?: Jimp.ImageCallback): this; - blit( - src: Jimp, - x: number, - y: number, - srcx: number, - srcy: number, - srcw: number, - srch: number, - cb?: Jimp.ImageCallback - ): this; - mask(src: Jimp, x: number, y: number, cb?: Jimp.ImageCallback): this; - - // Functions - static appendConstructorOption( - name: string, - test: (...args: T[]) => boolean, - run: ( - this: Jimp, - resolve: (jimp: Jimp) => any, - reject: (reason: Error) => any, - ...args: T[] - ) => any - ); - static read(path: string): Promise; - static read(image: Jimp): Promise; - static read(data: Buffer): Promise; - static read(w: number, h: number, background?: number): Promise; - static create(path: string): Promise; - static create(image: Jimp): Promise; - static create(data: Buffer): Promise; - static create(w: number, h: number, background?: number): Promise; - static rgbaToInt( - r: number, - g: number, - b: number, - a: number, - cb: GenericCallback - ): number; - static intToRGBA(i: number, cb?: GenericCallback): Jimp.RGBA; - static cssColorToHex(cssColor: string): number; - static limit255(n: number): number; - static diff( - img1: Jimp, - img2: Jimp, - threshold?: number - ): { percent: number; image: Jimp }; - static distance(img1: Jimp, img2: Jimp): number; - static colorDiff(rgba1: Jimp.RGB, rgba2: Jimp.RGB): number; - static colorDiff(rgba1: Jimp.RGBA, rgba2: Jimp.RGBA): number; - static loadFont(file: string): Promise; - static loadFont( - file: string, - cb: Jimp.GenericCallback - ): Promise; - static measureText(font: Font, text: PrintableText); - static measureTextHeight( - font: Font, - text: PrintableText, - maxWidth: number - ); - } -} - -declare module 'jimp' { - export = Jimp.Jimp; -} diff --git a/packages/core/package.json b/packages/core/package.json index 9f9e51d86..e9b3d34e0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -2,8 +2,8 @@ "name": "@jimp/core", "version": "0.3.5", "description": "Jimp core", - "main": "./dist/jimp.js", - "types": "./jimp.d.ts", + "main": "dist/jimp.js", + "module": "es/index.js", "files": [ "dist", "es", diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 38ee7b32d..3b9038c58 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -2,9 +2,10 @@ "name": "jimp", "version": "0.3.5", "description": "An image processing library written entirely in JavaScript (i.e. zero external or native dependencies).", - "main": "./dist/index.js", - "browser": "./browser/lib/jimp.js", - "types": "./jimp.d.ts", + "main": "dist/index.js", + "module": "es/index.js", + "browser": "browser/lib/jimp.js", + "types": "jimp.d.ts", "tonicExampleFilename": "example.js", "files": [ "browser", diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json index a1dac78f8..35a1fd044 100644 --- a/packages/plugin-blit/package.json +++ b/packages/plugin-blit/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Blit an image.", "main": "dist/index.js", + "module": "es/index.js", "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-blur/package.json b/packages/plugin-blur/package.json index 06defc780..f458fe183 100644 --- a/packages/plugin-blur/package.json +++ b/packages/plugin-blur/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "blur an image.", "main": "dist/index.js", + "module": "es/index.js", "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-color/package.json b/packages/plugin-color/package.json index 90c03c134..8de5df9cf 100644 --- a/packages/plugin-color/package.json +++ b/packages/plugin-color/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Bitmap manipulation to adjust the color in an image.", "main": "dist/index.js", + "module": "es/index.js", "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-contain/package.json b/packages/plugin-contain/package.json index ecfd849f9..79497a64e 100644 --- a/packages/plugin-contain/package.json +++ b/packages/plugin-contain/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "contain an image.", "main": "dist/index.js", + "module": "es/index.js", "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-cover/package.json b/packages/plugin-cover/package.json index 2a39bee7b..91a8deca5 100644 --- a/packages/plugin-cover/package.json +++ b/packages/plugin-cover/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "cover an image.", "main": "dist/index.js", + "module": "es/index.js", "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-crop/package.json b/packages/plugin-crop/package.json index bd16df6d6..83dc80dac 100644 --- a/packages/plugin-crop/package.json +++ b/packages/plugin-crop/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "crop an image.", "main": "dist/index.js", + "module": "es/index.js", "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-displace/package.json b/packages/plugin-displace/package.json index eadc5b19a..4341ec109 100644 --- a/packages/plugin-displace/package.json +++ b/packages/plugin-displace/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "displace an image.", "main": "dist/index.js", + "module": "es/index.js", "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/package.json b/packages/plugin-dither/package.json index ec227439d..4d27abc06 100644 --- a/packages/plugin-dither/package.json +++ b/packages/plugin-dither/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Dither an image.", "main": "dist/index.js", + "module": "es/index.js", "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-flip/package.json b/packages/plugin-flip/package.json index 45cad094b..5d14bd776 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "flip an image.", "main": "dist/index.js", + "module": "es/index.js", "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/package.json b/packages/plugin-gaussian/package.json index 5d9018346..30a761c8a 100644 --- a/packages/plugin-gaussian/package.json +++ b/packages/plugin-gaussian/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "gaussian blur an image.", "main": "dist/index.js", + "module": "es/index.js", "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/package.json b/packages/plugin-invert/package.json index 258ceb6e2..a9baff6b9 100644 --- a/packages/plugin-invert/package.json +++ b/packages/plugin-invert/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "invert an image.", "main": "dist/index.js", + "module": "es/index.js", "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/package.json b/packages/plugin-mask/package.json index 7568f8fc6..6269f5129 100644 --- a/packages/plugin-mask/package.json +++ b/packages/plugin-mask/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "mask an image.", "main": "dist/index.js", + "module": "es/index.js", "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-normalize/package.json b/packages/plugin-normalize/package.json index 87a0cc9da..0bec87603 100644 --- a/packages/plugin-normalize/package.json +++ b/packages/plugin-normalize/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "normalize an image.", "main": "dist/index.js", + "module": "es/index.js", "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-print/package.json b/packages/plugin-print/package.json index 3fce6c01b..9ec1c6ee5 100644 --- a/packages/plugin-print/package.json +++ b/packages/plugin-print/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "print an image.", "main": "dist/index.js", + "module": "es/index.js", "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-resize/package.json b/packages/plugin-resize/package.json index dec04f7b2..786f02890 100644 --- a/packages/plugin-resize/package.json +++ b/packages/plugin-resize/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Resize an image.", "main": "dist/index.js", + "module": "es/index.js", "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-rotate/package.json b/packages/plugin-rotate/package.json index d9b4159ad..59558fafd 100644 --- a/packages/plugin-rotate/package.json +++ b/packages/plugin-rotate/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Rotate an image.", "main": "dist/index.js", + "module": "es/index.js", "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-scale/package.json b/packages/plugin-scale/package.json index d39f8e468..8d6b293d2 100644 --- a/packages/plugin-scale/package.json +++ b/packages/plugin-scale/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "scale an image.", "main": "dist/index.js", + "module": "es/index.js", "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/package.json b/packages/type-bmp/package.json index 69192f0f6..7c1b430a0 100644 --- a/packages/type-bmp/package.json +++ b/packages/type-bmp/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Default Jimp bmp encoder/decoder.", "main": "dist/index.js", + "module": "es/index.js", "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-gif/package.json b/packages/type-gif/package.json index 8513d175d..b4cd5929d 100644 --- a/packages/type-gif/package.json +++ b/packages/type-gif/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Default Jimp gif encoder/decoder.", "main": "dist/index.js", + "module": "es/index.js", "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/package.json b/packages/type-jpeg/package.json index b28b4215a..f01b629e0 100644 --- a/packages/type-jpeg/package.json +++ b/packages/type-jpeg/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Default Jimp jpeg encoder/decoder.", "main": "dist/index.js", + "module": "es/index.js", "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-png/package.json b/packages/type-png/package.json index b749300d5..06881db28 100644 --- a/packages/type-png/package.json +++ b/packages/type-png/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Default Jimp png encoder/decoder.", "main": "dist/index.js", + "module": "es/index.js", "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-tiff/package.json b/packages/type-tiff/package.json index 4a59ace36..23c112bd8 100644 --- a/packages/type-tiff/package.json +++ b/packages/type-tiff/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Default Jimp tiff encoder/decoder.", "main": "dist/index.js", + "module": "es/index.js", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", diff --git a/packages/utils/package.json b/packages/utils/package.json index b887b07db..90cfc5dab 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -3,6 +3,7 @@ "version": "0.3.5", "description": "Utils for jimp extensions.", "main": "dist/index.js", + "module": "es/index.js", "scripts": { "build": "npm run build:node:production && npm run build:module", "build:watch": "npm run build:node:debug -- -- --watch --verbose", From a24211fe117856b519a4be2a1dc1f72efd910897 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 24 Aug 2018 18:32:11 -0700 Subject: [PATCH 4/5] switch to imports in types --- packages/type-bmp/src/index.js | 4 ++-- packages/type-gif/src/index.js | 2 +- packages/type-jpeg/src/index.js | 5 +++-- packages/type-png/src/index.js | 4 ++-- packages/type-tiff/src/index.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/type-bmp/src/index.js b/packages/type-bmp/src/index.js index 35a6c7bad..48965cee9 100644 --- a/packages/type-bmp/src/index.js +++ b/packages/type-bmp/src/index.js @@ -1,5 +1,5 @@ -const BMP = require('bmp-js'); -const { scan } = require('@jimp/utils'); +import BMP from 'bmp-js'; +import { scan } from '@jimp/utils'; const MIME_TYPE = 'image/bmp'; const MIME_TYPE_SECOND = 'image/x-ms-bmp'; diff --git a/packages/type-gif/src/index.js b/packages/type-gif/src/index.js index 161b00374..9933c2d6a 100644 --- a/packages/type-gif/src/index.js +++ b/packages/type-gif/src/index.js @@ -1,4 +1,4 @@ -const GIF = require('omggif'); +import GIF from 'omggif'; const MIME_TYPE = 'image/gif'; diff --git a/packages/type-jpeg/src/index.js b/packages/type-jpeg/src/index.js index ffc752d70..cc4d5c8a4 100644 --- a/packages/type-jpeg/src/index.js +++ b/packages/type-jpeg/src/index.js @@ -1,7 +1,8 @@ -const JPEG = require('jpeg-js'); -const { throwError, isNodePattern } = require('@jimp/utils'); +import JPEG from 'jpeg-js'; +import { throwError, isNodePattern } from '@jimp/utils'; const MIME_TYPE = 'image/jpeg'; + export default () => ({ mime: [MIME_TYPE, ['jpeg', 'jpg', 'jpe']], diff --git a/packages/type-png/src/index.js b/packages/type-png/src/index.js index 37f636b4b..13ce28d3f 100644 --- a/packages/type-png/src/index.js +++ b/packages/type-png/src/index.js @@ -1,5 +1,5 @@ -const { PNG } = require('pngjs'); -const { throwError, isNodePattern } = require('@jimp/utils'); +import { PNG } from 'pngjs'; +import { throwError, isNodePattern } from '@jimp/utils'; const MIME_TYPE = 'image/png'; diff --git a/packages/type-tiff/src/index.js b/packages/type-tiff/src/index.js index 5ed648fb3..797f829b8 100644 --- a/packages/type-tiff/src/index.js +++ b/packages/type-tiff/src/index.js @@ -1,4 +1,4 @@ -const UTIF = require('utif'); +import UTIF from 'utif'; const MIME_TYPE = 'image/tiff'; From 642b8b0e6cbdfd0cd88b5f4ac1b0f9d50a9fe8b7 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Fri, 24 Aug 2018 18:50:09 -0700 Subject: [PATCH 5/5] lint errros --- package.json | 2 +- packages/core/package.json | 2 +- packages/core/{tests => test}/utils/mime.test.js | 0 packages/jimp/package.json | 2 ++ packages/plugin-contain/src/index.js | 5 +++-- packages/plugin-displace/src/index.js | 2 +- packages/plugin-flip/src/index.js | 2 +- packages/plugin-mask/src/index.js | 2 +- packages/plugin-normalize/src/index.js | 2 +- packages/plugin-scale/src/index.js | 2 +- 10 files changed, 12 insertions(+), 9 deletions(-) rename packages/core/{tests => test}/utils/mime.test.js (100%) diff --git a/package.json b/package.json index 47d7403a7..35d4829a6 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ }, "overrides": [ { - "files": "**/test/*.js", + "files": "**/test/**/*.js", "esnext": false, "globals": [ "before" diff --git a/packages/core/package.json b/packages/core/package.json index e9b3d34e0..0d4f107de 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -2,7 +2,7 @@ "name": "@jimp/core", "version": "0.3.5", "description": "Jimp core", - "main": "dist/jimp.js", + "main": "dist/index.js", "module": "es/index.js", "files": [ "dist", diff --git a/packages/core/tests/utils/mime.test.js b/packages/core/test/utils/mime.test.js similarity index 100% rename from packages/core/tests/utils/mime.test.js rename to packages/core/test/utils/mime.test.js diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 3b9038c58..12ae1f1a3 100644 --- a/packages/jimp/package.json +++ b/packages/jimp/package.json @@ -60,6 +60,7 @@ "@jimp/png": "0.3.5", "@jimp/bmp": "0.3.5", "@jimp/tiff": "0.3.5", + "@jimp/gif": "0.3.5", "@jimp/plugin-color": "0.3.5", "@jimp/plugin-dither": "0.3.5", "@jimp/plugin-resize": "0.3.5", @@ -72,6 +73,7 @@ "@jimp/plugin-gaussian": "0.3.5", "@jimp/plugin-scale": "0.3.5", "@jimp/plugin-displace": "0.3.5", + "@jimp/plugin-normalize": "0.3.5", "@jimp/plugin-contain": "0.3.5", "@jimp/plugin-cover": "0.3.5", "@jimp/plugin-invert": "0.3.5", diff --git a/packages/plugin-contain/src/index.js b/packages/plugin-contain/src/index.js index bbf58b928..dab48f7b4 100644 --- a/packages/plugin-contain/src/index.js +++ b/packages/plugin-contain/src/index.js @@ -1,4 +1,4 @@ -import { isNodePattern } from '@jimp/utils'; +import { isNodePattern, throwError } from '@jimp/utils'; /** * Scale the image to the given width and height keeping the aspect ratio. Some parts of the image may be letter boxed. @@ -36,7 +36,8 @@ export default () => ({ alignBits = alignBits || - constants.HORIZONTAL_ALIGN_CENTER | constants.VERTICAL_ALIGN_MIDDLE; + this.constructor.HORIZONTAL_ALIGN_CENTER | + this.constructor.VERTICAL_ALIGN_MIDDLE; const hbits = alignBits & ((1 << 3) - 1); const vbits = alignBits >> 3; diff --git a/packages/plugin-displace/src/index.js b/packages/plugin-displace/src/index.js index 3b334cd5b..a45983a70 100644 --- a/packages/plugin-displace/src/index.js +++ b/packages/plugin-displace/src/index.js @@ -1,4 +1,4 @@ -import { isNodePattern } from '@jimp/utils'; +import { isNodePattern, throwError } from '@jimp/utils'; /** * Displaces the image based on the provided displacement map diff --git a/packages/plugin-flip/src/index.js b/packages/plugin-flip/src/index.js index 746ae18a2..7a88ce107 100644 --- a/packages/plugin-flip/src/index.js +++ b/packages/plugin-flip/src/index.js @@ -1,4 +1,4 @@ -import { isNodePattern } from '@jimp/utils'; +import { isNodePattern, throwError } from '@jimp/utils'; /** * Flip the image horizontally diff --git a/packages/plugin-mask/src/index.js b/packages/plugin-mask/src/index.js index caed9c834..29e8c9c25 100644 --- a/packages/plugin-mask/src/index.js +++ b/packages/plugin-mask/src/index.js @@ -1,4 +1,4 @@ -import { isNodePattern } from '@jimp/utils'; +import { isNodePattern, throwError } from '@jimp/utils'; /** * Masks a source image on to this image using average pixel colour. A completely black pixel on the mask will turn a pixel in the image completely transparent. diff --git a/packages/plugin-normalize/src/index.js b/packages/plugin-normalize/src/index.js index 7d6f81056..d9d47392d 100644 --- a/packages/plugin-normalize/src/index.js +++ b/packages/plugin-normalize/src/index.js @@ -1,6 +1,6 @@ /* eslint-disable no-labels */ -import { throwError, isNodePattern } from '@jimp/utils'; +import { isNodePattern } from '@jimp/utils'; /** * Get an image's histogram diff --git a/packages/plugin-scale/src/index.js b/packages/plugin-scale/src/index.js index 3bae45a46..cc1851026 100644 --- a/packages/plugin-scale/src/index.js +++ b/packages/plugin-scale/src/index.js @@ -1,4 +1,4 @@ -import { isNodePattern } from '@jimp/utils'; +import { isNodePattern, throwError } from '@jimp/utils'; export default () => ({ /**