Build stuff

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"

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 <[email protected]>",
   "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",

packages/custom/package.json

@@ -16,6 +16,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@jimp/core": "^0.3.4"
+    "@jimp/core": "^0.3.5"
   }
 }

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",

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"

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"

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": {

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"
   }
 }

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;
 

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"
   }
 }

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"

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"

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

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"

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"
   }
 }

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

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"

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"

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"

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.

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"

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

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": {