diff --git a/package.json b/package.json index 77edd510b..35d4829a6 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" }, @@ -87,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 ed855fac2..0d4f107de 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/index.js", + "module": "es/index.js", "files": [ "dist", "es", @@ -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/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/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/core/jimp.d.ts b/packages/jimp/jimp.d.ts similarity index 100% rename from packages/core/jimp.d.ts rename to packages/jimp/jimp.d.ts diff --git a/packages/jimp/package.json b/packages/jimp/package.json index 38ee7b32d..12ae1f1a3 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", @@ -59,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", @@ -71,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-blit/package.json b/packages/plugin-blit/package.json index 2e48a184d..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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..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", @@ -15,12 +16,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-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-cover/package.json b/packages/plugin-cover/package.json index 3140f3ec8..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", @@ -15,11 +16,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..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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/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-dither/package.json b/packages/plugin-dither/package.json index 3c738714d..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", @@ -15,7 +16,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..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", @@ -15,10 +16,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-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-gaussian/package.json b/packages/plugin-gaussian/package.json index eea2caf64..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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/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/package.json b/packages/plugin-normalize/package.json index 1f29097ce..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", @@ -15,7 +16,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/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-print/package.json b/packages/plugin-print/package.json index 0e63848aa..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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..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", @@ -15,7 +16,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..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", @@ -15,10 +16,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/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 () => ({ /** diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json index e03b2c11c..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", @@ -15,7 +16,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-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/package.json b/packages/type-gif/package.json index 43d571c9e..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", @@ -15,7 +16,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-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/package.json b/packages/type-jpeg/package.json index 563199c8f..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", @@ -15,7 +16,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-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/package.json b/packages/type-png/package.json index 058b65647..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", @@ -15,7 +16,7 @@ "author": "", "license": "MIT", "dependencies": { - "@jimp/utils": "^0.3.4", + "@jimp/utils": "^0.3.5", "pngjs": "^3.3.3" }, "peerDependencies": { 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/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/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'; 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",