Merge pull request #1108 from 20minutes/fix/remove-babel-esm

j0k3r · web-flow · commit 8ec94cdce2f5 · 2026-02-03T15:47:57.000+01:00
Jump to ESM, remove Babel et use ESLint 9
diff --git a/.babelrc b/.babelrc
diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,33 +3,11 @@ updates:
 - package-ecosystem: npm
   directory: "/"
   schedule:
-    interval: daily
-    time: "02:00"
+    interval: weekly
+    time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
-  reviewers:
-  - j0k3r
-  groups:
-    babel-dependencies:
-      patterns:
-        - "*babel*"
   ignore:
-  # because of ESM
-  - dependency-name: "semver-diff"
-    versions:
-    - ">= 4.0.0"
-  # because of ESM
-  - dependency-name: "node-fetch"
-    versions:
-    - "> 2"
-  # because of ESM
-  - dependency-name: "@octokit/rest"
-    versions:
-    - ">= 21"
-  # because of ESM
-  - dependency-name: "@octokit/graphql"
-    versions:
-    - ">= 8"
   # because it requires Serverless v4
   - dependency-name: "serverless-offline"
     versions:
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,12 @@
+import baseConfig from '@20minutes/eslint-config'
+
+export default [
+  ...baseConfig,
+  {
+    settings: {
+      react: {
+        version: '18.0',
+      },
+    },
+  },
+]
diff --git a/functions/artifacts.js b/functions/artifacts.js
@@ -1,4 +1,4 @@
-import { ArtifactsHandler } from './classes/ArtifactsHandler'
+import { ArtifactsHandler } from './classes/ArtifactsHandler.js'
 
 const artifacts = new ArtifactsHandler(
   process.env.GITHUB_TOKEN,
diff --git a/functions/auto-merge.js b/functions/auto-merge.js
@@ -1,4 +1,4 @@
-import { AutomergeHandler } from './classes/AutomergeHandler'
+import { AutomergeHandler } from './classes/AutomergeHandler.js'
 
 const autoMerge = new AutomergeHandler(process.env.GITHUB_TOKEN)
 
diff --git a/functions/classes/ArtifactsHandler.js b/functions/classes/ArtifactsHandler.js
@@ -1,4 +1,4 @@
-import { Handler } from './Handler'
+import { Handler } from './Handler.js'
 
 export class ArtifactsHandler extends Handler {
   constructor(githubToken, namespace = '', artifactsRegex = '') {
diff --git a/functions/classes/AutomergeHandler.js b/functions/classes/AutomergeHandler.js
@@ -1,6 +1,6 @@
 import { GraphqlResponseError } from '@octokit/graphql'
-import semverDiff from 'semver-diff'
-import { Handler } from './Handler'
+import semverDiff from 'semver/functions/diff'
+import { Handler } from './Handler.js'
 
 export class AutomergeHandler extends Handler {
   async handle(body, callback) {
diff --git a/functions/classes/FixupHandler.js b/functions/classes/FixupHandler.js
@@ -1,4 +1,4 @@
-import { Handler } from './Handler'
+import { Handler } from './Handler.js'
 
 export class FixupHandler extends Handler {
   constructor(githubToken, namespace = '') {
diff --git a/functions/classes/Handler.js b/functions/classes/Handler.js
@@ -14,7 +14,6 @@ export class Handler {
     })
   }
 
-  // eslint-disable-next-line class-methods-use-this
   validateEvent(body) {
     // when creating the webhook
     if (body && 'hook' in body) {
diff --git a/functions/classes/LabelHandler.js b/functions/classes/LabelHandler.js
@@ -1,4 +1,4 @@
-import { Handler } from './Handler'
+import { Handler } from './Handler.js'
 
 export class LabelHandler extends Handler {
   constructor(githubToken, namespace = '', blockLabels = '') {
diff --git a/functions/classes/SpecificationHandler.js b/functions/classes/SpecificationHandler.js
@@ -1,4 +1,4 @@
-import { Handler } from './Handler'
+import { Handler } from './Handler.js'
 
 export class SpecificationHandler extends Handler {
   constructor(githubToken, namespace = '', titleLength = 8, bodyLength = 8) {
diff --git a/functions/fixup.js b/functions/fixup.js
@@ -1,4 +1,4 @@
-import { FixupHandler } from './classes/FixupHandler'
+import { FixupHandler } from './classes/FixupHandler.js'
 
 const fixup = new FixupHandler(process.env.GITHUB_TOKEN, process.env.NAMESPACE)
 
diff --git a/functions/label.js b/functions/label.js
@@ -1,4 +1,4 @@
-import { LabelHandler } from './classes/LabelHandler'
+import { LabelHandler } from './classes/LabelHandler.js'
 
 const label = new LabelHandler(
   process.env.GITHUB_TOKEN,
diff --git a/functions/specification.js b/functions/specification.js
@@ -1,4 +1,4 @@
-import { SpecificationHandler } from './classes/SpecificationHandler'
+import { SpecificationHandler } from './classes/SpecificationHandler.js'
 
 const spec = new SpecificationHandler(
   process.env.GITHUB_TOKEN,
diff --git a/package.json b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "serverless-github-check",
+  "type": "module",
   "main": "handler.js",
   "scripts": {
-    "test": "jest --silent",
-    "test:watch": "jest --watch",
+    "test": "node --experimental-vm-modules ./node_modules/.bin/jest --silent",
+    "test:watch": "node --experimental-vm-modules ./node_modules/.bin/jest --watch",
     "lint": "eslint functions/ tests/"
   },
   "author": "20 Minutes <web-tech@20minutes.fr>",
@@ -14,42 +15,36 @@
     "node": ">= 22"
   },
   "devDependencies": {
-    "@20minutes/eslint-config": "^1.2.7",
-    "@babel/core": "^7.29.0",
-    "@babel/eslint-parser": "^7.28.6",
-    "@babel/preset-env": "^7.29.0",
+    "@20minutes/eslint-config": "^2.0.0",
     "@fetch-mock/jest": "^0.2.20",
-    "babel-loader": "^10.0.0",
-    "babel-plugin-source-map-support": "^2.2.0",
-    "eslint": "^8.57.1",
+    "eslint": "^9.39.2",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
     "jest": "^30.2.0",
-    "node-fetch": "2",
+    "node-fetch": "3.3.2",
     "prettier": "^3.8.1",
-    "regenerator-runtime": "^0.14.1",
     "serverless-offline": "^13.9.0",
     "serverless-webpack": "^5.15.3",
     "webpack": "^5.104.1",
     "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.28.6",
     "@octokit/graphql": "^7.1.1",
     "@octokit/rest": "^20.1.2",
-    "semver-diff": "3.1.1",
+    "semver": "^7.7.3",
     "source-map-support": "^0.5.21",
     "uri-js": "npm:uri-js-replace"
   },
   "jest": {
     "verbose": true,
     "clearMocks": true,
     "testEnvironment": "node",
+    "transform": {},
     "collectCoverage": true,
     "collectCoverageFrom": [
       "functions/**/*.js",
diff --git a/serverless.yml b/serverless.yml
@@ -26,6 +26,7 @@ package:
 
 custom:
     webpack:
+        webpackConfig: 'webpack.config.cjs'
         includeModules: true
         packager: yarn
         excludeRegex: 'node_modules/(@aws-sdk|@aws-crypto|(.+\.(md|JPG|jpg|jpeg)$))|yarn\.lock'
diff --git a/tests/artifcats.spec.js b/tests/artifcats.spec.js
@@ -1,6 +1,7 @@
 import fetchMock from '@fetch-mock/jest'
-import { ArtifactsHandler } from '../functions/classes/ArtifactsHandler'
-import { handler } from '../functions/fixup'
+import { jest } from '@jest/globals'
+import { ArtifactsHandler } from '../functions/classes/ArtifactsHandler.js'
+import { handler } from '../functions/fixup.js'
 
 describe('Validating GitHub event', () => {
   test('bad content type', async () => {
diff --git a/tests/auto-merge.spec.js b/tests/auto-merge.spec.js
@@ -1,6 +1,7 @@
 import fetchMock from '@fetch-mock/jest'
-import { AutomergeHandler } from '../functions/classes/AutomergeHandler'
-import { handler } from '../functions/auto-merge'
+import { jest } from '@jest/globals'
+import { AutomergeHandler } from '../functions/classes/AutomergeHandler.js'
+import { handler } from '../functions/auto-merge.js'
 
 describe('Validating GitHub event', () => {
   test('bad content type', async () => {
diff --git a/tests/fixup.spec.js b/tests/fixup.spec.js
@@ -1,6 +1,7 @@
 import fetchMock from '@fetch-mock/jest'
-import { FixupHandler } from '../functions/classes/FixupHandler'
-import { handler } from '../functions/fixup'
+import { jest } from '@jest/globals'
+import { FixupHandler } from '../functions/classes/FixupHandler.js'
+import { handler } from '../functions/fixup.js'
 
 describe('Validating GitHub event', () => {
   test('bad content type', async () => {
diff --git a/tests/label.spec.js b/tests/label.spec.js
@@ -1,6 +1,7 @@
 import fetchMock from '@fetch-mock/jest'
-import { LabelHandler } from '../functions/classes/LabelHandler'
-import { handler } from '../functions/label'
+import { jest } from '@jest/globals'
+import { LabelHandler } from '../functions/classes/LabelHandler.js'
+import { handler } from '../functions/label.js'
 
 describe('Validating GitHub event', () => {
   test('bad content type', async () => {
diff --git a/tests/specification.spec.js b/tests/specification.spec.js
@@ -1,6 +1,7 @@
 import fetchMock from '@fetch-mock/jest'
-import { SpecificationHandler } from '../functions/classes/SpecificationHandler'
-import { handler } from '../functions/specification'
+import { jest } from '@jest/globals'
+import { SpecificationHandler } from '../functions/classes/SpecificationHandler.js'
+import { handler } from '../functions/specification.js'
 
 describe('Validating GitHub event', () => {
   test('bad content type', async () => {
diff --git a/webpack.config.cjs b/webpack.config.cjs
@@ -8,16 +8,4 @@ module.exports = {
   devtool: 'source-map',
   externals: [nodeExternals()],
   mode: slsw.lib.webpack.isLocal ? 'development' : 'production',
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        use: {
-          loader: 'babel-loader',
-        },
-        include: __dirname,
-        exclude: /node_modules/,
-      },
-    ],
-  },
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ArtifactsHandler } from './classes/ArtifactsHandler'`
	`1`	`+import { ArtifactsHandler } from './classes/ArtifactsHandler.js'`
`2`	`2`
`3`	`3`	`const artifacts = new ArtifactsHandler(`
`4`	`4`	`process.env.GITHUB_TOKEN,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { AutomergeHandler } from './classes/AutomergeHandler'`
	`1`	`+import { AutomergeHandler } from './classes/AutomergeHandler.js'`
`2`	`2`
`3`	`3`	`const autoMerge = new AutomergeHandler(process.env.GITHUB_TOKEN)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Handler } from './Handler'`
	`1`	`+import { Handler } from './Handler.js'`
`2`	`2`
`3`	`3`	`export class ArtifactsHandler extends Handler {`
`4`	`4`	`constructor(githubToken, namespace = '', artifactsRegex = '') {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ export class Handler {`
`14`	`14`	`})`
`15`	`15`	`}`
`16`	`16`
`17`		`- // eslint-disable-next-line class-methods-use-this`
`18`	`17`	`validateEvent(body) {`
`19`	`18`	`// when creating the webhook`
`20`	`19`	`if (body && 'hook' in body) {`