upgrade eslint

.ncurc.json

@@ -1,3 +1,11 @@
 {
-  "reject": ["pixelmatch", "mime", "@types/mime", "file-typ"]
+  "reject": [
+    // These deps are esm only
+    "pixelmatch",
+    "mime",
+    "@types/mime",
+    "file-type",
+    // We support node 18 and above
+    "@types/node"
+  ]
 }

package.json

@@ -18,7 +18,8 @@
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "release": "pnpm build && auto shipit",
     "generate-package": "turbo gen package",
-    "generate-plugin": "turbo gen plugin"
+    "generate-plugin": "turbo gen plugin",
+    "check-updates": "ncu --packageFile '{,*/**/}package.json'"
   },
   "devDependencies": {
     "@auto-it/all-contributors": "^11.2.1",
@@ -28,6 +29,7 @@
     "@jimp/config-typescript": "workspace:*",
     "@turbo/gen": "^2.1.1",
     "auto": "^11.2.1",
+    "npm-check-updates": "^17.1.1",
     "prettier": "^3.3.3",
     "turbo": "^2.1.1"
   }

packages/config-eslint/base.js

@@ -1,44 +1,28 @@
-const { resolve } = require("node:path");
+import js from "@eslint/js";
+import eslintConfigPrettier from "eslint-config-prettier";
+import turboPlugin from "eslint-plugin-turbo";
+import tseslint from "typescript-eslint";
 
-const project = resolve(process.cwd(), "tsconfig.json");
-
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: [
-    "eslint:recommended",
-    "prettier",
-    "eslint-config-turbo",
-    "plugin:@typescript-eslint/recommended",
-  ],
-  plugins: ["only-warn"],
-  globals: {
-    React: true,
-    JSX: true,
-  },
-  env: {
-    node: true,
+export default [
+  js.configs.recommended,
+  eslintConfigPrettier,
+  ...tseslint.configs.recommended,
+  {
+    ignores: [
+      // Ignore dotfiles
+      ".*.js",
+      "node_modules/",
+      "dist/",
+      "**/browser.js",
+    ],
   },
-  settings: {
-    "import/resolver": {
-      typescript: {
-        project,
-      },
+  {
+    name: "eslint-config-turbo (recreated flat)",
+    plugins: {
+      turbo: { rules: turboPlugin.rules },
     },
-  },
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    project,
-  },
-  ignorePatterns: [
-    // Ignore dotfiles
-    ".*.js",
-    "node_modules/",
-    "dist/",
-    "**/browser.js",
-  ],
-  overrides: [
-    {
-      files: ["*.js?(x)", "*.ts?(x)"],
+    rules: {
+      "turbo/no-undeclared-env-vars": "error",
     },
-  ],
-};
+  },
+];

packages/config-eslint/package.json

@@ -4,17 +4,20 @@
   "license": "MIT",
   "private": true,
   "main": "base.js",
+  "type": "module",
   "scripts": {
     "clean": "rm -rf node_modules .tshy .tshy-build dist .turbo"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-turbo": "^1.12.5",
-    "eslint-plugin-only-warn": "^1.1.0",
+    "eslint-config-turbo": "^2.1.1",
     "typescript": "^5.5.4"
   },
   "publishConfig": {},
-  "sideEffects": false
+  "sideEffects": false,
+  "dependencies": {
+    "@eslint/js": "^9.9.1",
+    "@types/eslint__js": "^8.42.3",
+    "typescript-eslint": "^8.3.0"
+  }
 }

packages/config-vitest/package.json

@@ -15,7 +15,7 @@
   "devDependencies": {
     "@jimp/config-typescript": "workspace:*",
     "@jimp/test-utils": "workspace:*",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"
   },

packages/core/eslint.config.mjs

@@ -0,0 +1,9 @@
+import shared from "@jimp/config-eslint/base.js";
+export default [
+  ...shared,
+  {
+    rules: {
+      "@typescript-eslint/no-explicit-any": "off",
+    },
+  },
+];

packages/core/package.json

@@ -30,7 +30,7 @@
     "@types/file-type": "^10.9.1",
     "@types/mime": "^3.0.4",
     "@types/node": "^18.19.48",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "tshy": "^3.0.2",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"

packages/core/src/index.ts

@@ -90,7 +90,7 @@ export interface JimpPlugin {
 }
 
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I,
+  k: infer I
 ) => void
   ? I
   : never;
@@ -272,8 +272,8 @@ export function createJimp<
       if (Array.isArray(bitmap.data)) {
         data = Buffer.concat(
           bitmap.data.map((hex) =>
-            Buffer.from(hex.toString(16).padStart(8, "0"), "hex"),
-          ),
+            Buffer.from(hex.toString(16).padStart(8, "0"), "hex")
+          )
         );
       }
 
@@ -316,7 +316,7 @@ export function createJimp<
       }
 
       const image = new CustomJimp(
-        await format.decode(actualBuffer),
+        await format.decode(actualBuffer)
       ) as InstanceType<typeof CustomJimp> & ExtraMethodMap;
 
       attemptExifRotate(image, actualBuffer);
@@ -386,6 +386,7 @@ export function createJimp<
       let outputImage: Jimp;
 
       if (format.hasAlpha) {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         outputImage = this;
       } else {
         outputImage = new CustomJimp({
@@ -456,7 +457,7 @@ export function createJimp<
       const mimeType = mime.getType(path);
       await writeFile(
         path,
-        await this.getBuffer(mimeType as SupportedMimeTypes, options),
+        await this.getBuffer(mimeType as SupportedMimeTypes, options)
       );
     }
 
@@ -657,7 +658,7 @@ export function createJimp<
         mode?: BlendMode;
         opacitySource?: number;
         opacityDest?: number;
-      } = {},
+      } = {}
     ) {
       return composite(this, src, x, y, options);
     }
@@ -687,14 +688,14 @@ export function createJimp<
       y: number,
       w: number,
       h: number,
-      cb: (x: number, y: number, idx: number) => any,
+      cb: (x: number, y: number, idx: number) => any
     ): this;
     scan(
       x: number | ((x: number, y: number, idx: number) => any),
       y?: number,
       w?: number,
       h?: number,
-      f?: (x: number, y: number, idx: number) => any,
+      f?: (x: number, y: number, idx: number) => any
     ): this {
       return scan(this, x as any, y as any, w as any, h as any, f as any);
     }

packages/core/src/utils/composite.ts

@@ -2,7 +2,7 @@ import { Edge, JimpClass } from "@jimp/types";
 
 import { BlendMode } from "./constants.js";
 import * as compositeModes from "./composite-modes.js";
-import { limit255, scan } from "@jimp/utils";
+import { limit255 } from "@jimp/utils";
 
 export function composite<I extends JimpClass>(
   baseImage: I,
@@ -13,7 +13,7 @@ export function composite<I extends JimpClass>(
     mode?: BlendMode;
     opacitySource?: number;
     opacityDest?: number;
-  } = {},
+  } = {}
 ) {
   if (!(src instanceof baseImage.constructor)) {
     throw new Error("The source must be a Jimp image");
@@ -23,11 +23,8 @@ export function composite<I extends JimpClass>(
     throw new Error("x and y must be numbers");
   }
 
-  let {
-    mode = BlendMode.SRC_OVER,
-    opacitySource = 1.0,
-    opacityDest = 1.0,
-  } = options;
+  const { mode = BlendMode.SRC_OVER } = options;
+  let { opacitySource = 1.0, opacityDest = 1.0 } = options;
 
   if (
     typeof opacitySource !== "number" ||
@@ -41,7 +38,6 @@ export function composite<I extends JimpClass>(
     opacityDest = 1.0;
   }
 
-  // eslint-disable-next-line import/namespace
   const blendmode = compositeModes[mode];
 
   // round input
@@ -76,7 +72,7 @@ export function composite<I extends JimpClass>(
         b: baseImage.bitmap.data[dstIdx + 2]! / 255,
         a: baseImage.bitmap.data[dstIdx + 3]! / 255,
       },
-      opacitySource,
+      opacitySource
     );
 
     baseImage.bitmap.data[dstIdx + 0] = limit255(blended.r * 255);

packages/core/src/utils/image-bitmap.ts

@@ -1,12 +1,6 @@
 import EXIFParser, { ExifData } from "exif-parser";
 import { JimpClass } from "@jimp/types";
 
-const EXIF_TAGS = {
-  ORIENTATION: 0x0112, // decimal: 274
-  IMAGE_WIDTH: 0x0100, // decimal: 256
-  IMAGE_HEIGHT: 0x0101, // decimal: 257
-};
-
 /**
  * Obtains image orientation from EXIF metadata.
  *
@@ -95,7 +89,7 @@ function transformBitmap<I extends JimpClass>(
   img: I,
   width: number,
   height: number,
-  transformation: (x: number, y: number) => readonly [number, number],
+  transformation: (x: number, y: number) => readonly [number, number]
 ) {
   // Underscore-prefixed values are related to the source bitmap
   // Their counterparts with no prefix are related to the target bitmap
@@ -120,7 +114,7 @@ function transformBitmap<I extends JimpClass>(
   img.bitmap.width = width;
   img.bitmap.height = height;
 
-  // @ts-ignore
+  // @ts-expect-error Accessing private property
   img._exif.tags.Orientation = 1;
 }
 
@@ -146,14 +140,14 @@ function exifRotate<I extends JimpClass>(img: I) {
 
 export async function attemptExifRotate<I extends JimpClass>(
   image: I,
-  buffer: Buffer,
+  buffer: Buffer
 ) {
   try {
     (image as unknown as { _exif: ExifData })._exif =
       EXIFParser.create(buffer).parse();
 
     exifRotate(image); // EXIF data
   } catch (error) {
-    /* meh */
+    console.error(error);
   }
 }

packages/diff/eslint.config.mjs

@@ -0,0 +1,2 @@
+import shared from "@jimp/config-eslint/base.js";
+export default [...shared];

packages/diff/package.json

@@ -26,7 +26,7 @@
     "@jimp/core": "workspace:*",
     "@jimp/test-utils": "workspace:*",
     "@types/pixelmatch": "^5.2.6",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "tshy": "^3.0.2",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"

packages/diff/src/index.ts

@@ -48,6 +48,7 @@ export function diff<I extends JimpClass>(img1: I, img2: I, threshold = 0.1) {
     throw new Error("threshold must be a number between 0 and 1");
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const diff = new (img1 as any).constructor({
     width: bmp1.width,
     height: bmp1.height,
@@ -60,7 +61,7 @@ export function diff<I extends JimpClass>(img1: I, img2: I, threshold = 0.1) {
     diff.bitmap.data,
     diff.bitmap.width,
     diff.bitmap.height,
-    { threshold },
+    { threshold }
   );
 
   return {

packages/docs/package.json

@@ -20,7 +20,7 @@
     "@jimp/plugin-print": "workspace:*",
     "@types/react": "^18.3.5",
     "astro": "^4.15.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "jimp": "workspace:*",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

packages/file-ops/eslint.config.mjs

@@ -0,0 +1,2 @@
+import shared from "@jimp/config-eslint/base.js";
+export default [...shared];

packages/file-ops/package.json

@@ -17,7 +17,7 @@
     "@jimp/config-eslint": "workspace:*",
     "@jimp/config-typescript": "workspace:*",
     "@types/node": "^18.19.48",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "tshy": "^3.0.2",
     "typescript": "^5.5.4",
     "vitest": "^2.0.5"