Babel Refactor (#1149)

* upgrade babel, fix module build, remove babel runtime, target modern JS * fix tests
jimp-dev · Feb 5, 2023 · f8c4bee · f8c4bee
1 parent cebbdb7
commit f8c4bee
Show file tree

Hide file tree

Showing 39 changed files with 1,035 additions and 1,077 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1 @@
+defaults and supports es6-module, maintained node versions
diff --git a/babel.config.js b/babel.config.js
@@ -2,36 +2,30 @@ module.exports = (api) => {
   api.cache(true);
 
   return {
-    presets: ["@babel/preset-env"],
+    presets: [
+      [
+        "@babel/preset-env",
+        {
+          modules: process.env.BABEL_ENV === "module" ? false : "cjs",
+          useBuiltIns: false,
+        },
+      ],
+    ],
 
     plugins: [
-      "@babel/proposal-class-properties",
-      "@babel/syntax-object-rest-spread",
       process.env.BABEL_ENV !== "module" && "add-module-exports",
       [
         "transform-inline-environment-variables",
         { include: ["BABEL_ENV", "ENV"] },
       ],
-      [
-        "@babel/plugin-transform-runtime",
-        {
-          regenerator: true,
-        },
-      ],
     ].filter(Boolean),
 
     env: {
-      test: {
-        plugins: ["istanbul"],
-      },
       development: {
         plugins: [process.env.ENV !== "browser" && "source-map-support"].filter(
           Boolean
         ),
       },
-      module: {
-        presets: [["@babel/preset-env"]],
-      },
     },
   };
 };
diff --git a/package.json b/package.json
@@ -31,22 +31,16 @@
     "@auto-it/first-time-contributor": "^10.38.4",
     "@auto-it/magic-zero": "^10.38.4",
     "@auto-it/protected-branch": "^10.38.4",
-    "@babel/cli": "^7.7.0",
-    "@babel/core": "^7.7.2",
-    "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.6.2",
-    "@babel/preset-env": "^7.7.1",
-    "@babel/register": "^7.7.0",
-    "@babel/runtime": "^7.7.2",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/register": "^7.18.9",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",
     "all-contributors-cli": "^6.24.0",
     "auto": "^10.38.4",
-    "babel-eslint": "^10.0.3",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-istanbul": "^5.2.0",
-    "babel-plugin-source-map-support": "^2.1.1",
+    "babel-plugin-add-module-exports": "^1.0.4",
+    "babel-plugin-source-map-support": "^2.2.0",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "cross-env": "^6.0.0",
     "dtslint": "^4.2.1",
@@ -69,7 +63,7 @@
     "patch-package": "^6.5.1",
     "prettier": "^2.8.3",
     "should": "^13.2.3",
-    "source-map-support": "^0.5.13"
+    "source-map-support": "^0.5.21"
   },
   "husky": {
     "hooks": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -29,7 +29,6 @@
   "author": "Oliver Moran <oliver.moran@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "any-base": "^1.1.0",
     "buffer": "^5.2.0",

diff --git a/packages/custom/package.json b/packages/custom/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/core": "link:../core"
   },
   "publishConfig": {

diff --git a/packages/jimp/package.json b/packages/jimp/package.json
@@ -45,27 +45,15 @@
   "author": "Oliver Moran <oliver.moran@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/custom": "link:../custom",
     "@jimp/plugins": "link:../plugins",
     "@jimp/types": "link:../types",
     "regenerator-runtime": "^0.13.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.0",
-    "@babel/core": "^7.7.2",
-    "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
-    "@babel/preset-env": "^7.7.1",
-    "@babel/register": "^7.7.0",
     "@jimp/test-utils": "link:../test-utils",
-    "babel-eslint": "^10.0.3",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-istanbul": "^5.2.0",
-    "babel-plugin-source-map-support": "^2.1.1",
     "express": "^4.17.1",
     "path-browserify": "^1.0.1",
-    "source-map-support": "^0.5.13",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },

diff --git a/packages/jimp/test/scan.test.js b/packages/jimp/test/scan.test.js
@@ -31,13 +31,13 @@ describe("Scan (pixel matrix modification)", () => {
   });
 
   it("draw bars with iterate scan", async () => {
-    const image = await Jimp.create(8, 3);
+    const j = await Jimp.create(8, 3);
 
-    for (const { x, y, idx, image } of image.scanIterator(
+    for (const { x, y, idx, image } of j.scanIterator(
       0,
       0,
-      image.bitmap.width,
-      image.bitmap.height
+      j.bitmap.width,
+      j.bitmap.height
     )) {
       const color = [
         [0xff, 0x00, 0x00],
@@ -52,7 +52,7 @@ describe("Scan (pixel matrix modification)", () => {
       image.bitmap.data[idx + 3] = y === 2 ? 0x7f : 0xff;
     }
 
-    image.getJGDSync().should.be.sameJGD(barsJGD, "Color bars");
+    j.getJGDSync().should.be.sameJGD(barsJGD, "Color bars");
   });
 
   it("draw bars with (get|set)PixelColor", async () => {

diff --git a/packages/jimp/webpack.config.ts b/packages/jimp/webpack.config.ts
@@ -7,6 +7,7 @@ export default {
   mode: isProd ? "production" : "development",
   devtool: isProd ? "source-map" : "eval-cheap-module-source-map",
   entry: "./src/index.js",
+  target: "web",
   resolve: {
     alias: {
       pngjs: "pngjs/browser",

diff --git a/packages/plugin-blit/package.json b/packages/plugin-blit/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "devDependencies": {

diff --git a/packages/plugin-blur/package.json b/packages/plugin-blur/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-circle/package.json b/packages/plugin-circle/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-color/package.json b/packages/plugin-color/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "tinycolor2": "^1.4.1"
   },

diff --git a/packages/plugin-contain/package.json b/packages/plugin-contain/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-cover/package.json b/packages/plugin-cover/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-crop/package.json b/packages/plugin-crop/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "devDependencies": {

diff --git a/packages/plugin-displace/package.json b/packages/plugin-displace/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-dither/package.json b/packages/plugin-dither/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-fisheye/package.json b/packages/plugin-fisheye/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-gaussian/package.json b/packages/plugin-gaussian/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-invert/package.json b/packages/plugin-invert/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-mask/package.json b/packages/plugin-mask/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-normalize/package.json b/packages/plugin-normalize/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-print/package.json b/packages/plugin-print/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "load-bmfont": "^1.4.1"
   },

diff --git a/packages/plugin-resize/package.json b/packages/plugin-resize/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-rotate/package.json b/packages/plugin-rotate/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-scale/package.json b/packages/plugin-scale/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-shadow/package.json b/packages/plugin-shadow/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugin-threshold/package.json b/packages/plugin-threshold/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils"
   },
   "peerDependencies": {

diff --git a/packages/plugins/package.json b/packages/plugins/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/plugin-blit": "link:../plugin-blit",
     "@jimp/plugin-blur": "link:../plugin-blur",
     "@jimp/plugin-circle": "link:../plugin-circle",

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -23,7 +23,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "pngjs": "^6.0.0"
   },
   "devDependencies": {

diff --git a/packages/type-bmp/package.json b/packages/type-bmp/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "bmp-js": "^0.1.0"
   },

diff --git a/packages/type-gif/package.json b/packages/type-gif/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "gifwrap": "^0.9.2",
     "omggif": "^1.0.9"

diff --git a/packages/type-jpeg/package.json b/packages/type-jpeg/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "jpeg-js": "^0.4.4"
   },

diff --git a/packages/type-png/package.json b/packages/type-png/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/utils": "link:../utils",
     "pngjs": "^6.0.0"
   },

diff --git a/packages/type-tiff/package.json b/packages/type-tiff/package.json
@@ -21,7 +21,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "utif2": "^4.0.1"
   },
   "peerDependencies": {

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -18,7 +18,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.7.2",
     "@jimp/bmp": "link:../type-bmp",
     "@jimp/gif": "link:../type-gif",
     "@jimp/jpeg": "link:../type-jpeg",