fix eslint

thomas-lebeau · thomas-lebeau · commit bf31991ee783 · 2025-10-09T11:50:05.000+02:00
diff --git a/developer-extension/tsconfig.webpack.json b/developer-extension/tsconfig.webpack.json
@@ -3,13 +3,15 @@
 
   "compilerOptions": {
     "baseUrl": ".",
-    "module": "ES6",
+    "module": "preserve",
     "target": "esnext",
     "jsx": "react",
     "lib": ["ES2022", "DOM"],
     "types": ["chrome", "react", "react-dom", "jasmine"],
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "allowImportingTsExtensions": true,
+    "noEmit": true
   },
 
-  "include": ["src"]
+  "include": ["src", "webpack.config.mts"]
 }
diff --git a/eslint-local-rules/disallowEnumExports.js b/eslint-local-rules/disallowEnumExports.js
@@ -1,4 +1,4 @@
-const { SymbolFlags } = require('typescript')
+import { SymbolFlags } from 'typescript'
 
 /**
  * This rule forbids exporting 'enums'.  It serves two purposes:
@@ -34,7 +34,7 @@ const { SymbolFlags } = require('typescript')
  * [1]: https://www.typescriptlang.org/tsconfig#isolatedModules
  * [2]: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export
  */
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Disallow export of enums.',
diff --git a/eslint-local-rules/disallowGenericUtils.js b/eslint-local-rules/disallowGenericUtils.js
@@ -1,6 +1,6 @@
-const path = require('path')
+import path from 'path'
 
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Disallow the use of too generic utility file names',
diff --git a/eslint-local-rules/disallowNonScripts.js b/eslint-local-rules/disallowNonScripts.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Disallow JS files that are not used as a "script"',
diff --git a/eslint-local-rules/disallowProtectedDirectoryImport.cjs b/eslint-local-rules/disallowProtectedDirectoryImport.cjs
@@ -1,5 +1,6 @@
 const path = require('path')
 const { minimatch } = require('minimatch')
+
 const resolve = require('eslint-module-utils/resolve').default
 const moduleVisitor = require('eslint-module-utils/moduleVisitor').default
 const importType = require('eslint-plugin-import/lib/core/importType').default
diff --git a/eslint-local-rules/disallowSideEffects.js b/eslint-local-rules/disallowSideEffects.js
@@ -1,6 +1,6 @@
-const path = require('path')
+import path from 'path'
 
-module.exports = {
+export default {
   meta: {
     docs: {
       description:
@@ -22,7 +22,7 @@ module.exports = {
   },
 }
 
-const packagesRoot = path.resolve(__dirname, '..', 'packages')
+const packagesRoot = path.resolve(import.meta.dirname, '..', 'packages')
 
 // Those modules are known to have side effects when evaluated
 const pathsWithSideEffect = new Set([
diff --git a/eslint-local-rules/disallowSpecImport.js b/eslint-local-rules/disallowSpecImport.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Disallow importing spec file code to avoid to execute the tests from the imported spec file twice',
diff --git a/eslint-local-rules/disallowTestImportExportFromSrc.js b/eslint-local-rules/disallowTestImportExportFromSrc.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   meta: {
     docs: {
       description:
diff --git a/eslint-local-rules/disallowUrlConstructorPatchValues.js b/eslint-local-rules/disallowUrlConstructorPatchValues.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Disallow problematic URL constructor patched values.',
diff --git a/eslint-local-rules/disallowZoneJsPatchedValues.js b/eslint-local-rules/disallowZoneJsPatchedValues.js
@@ -19,7 +19,7 @@ const PROBLEMATIC_IDENTIFIERS = {
   removeEventListener: 'Use `addEventListener().stop` from @datadog/browser-core instead',
 }
 
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Disallow problematic ZoneJs patched values.',
diff --git a/eslint-local-rules/enforceProdDepsImports.cjs b/eslint-local-rules/enforceProdDepsImports.cjs
@@ -1,4 +1,5 @@
 const fs = require('fs')
+
 const moduleVisitor = require('eslint-module-utils/moduleVisitor').default
 const importType = require('eslint-plugin-import/lib/core/importType').default
 const pkgUp = require('eslint-module-utils/pkgUp').default
@@ -11,7 +12,7 @@ const pkgUp = require('eslint-module-utils/pkgUp').default
 // should better suit our needs.
 //
 // [1]: https://github.com/DataDog/browser-sdk/pull/3405
-// [2]: https://github.com/import-js/eslint-plugin-import/blob/4f145a2c64af4931f4bf3ae951c8b719b544718f/src/rules/no-extraneous-dependencies.js#L221-L223
+// [2]: https://github.com/import-js/eslint-plugin-import/blob/4fmodule.145a2cs6=f4bf3ae951c8b719b544718f/src/rules/no-extraneous-dependencies.js#L221-L223
 
 const packageJsonCache = new Map()
 
diff --git a/eslint-local-rules/index.js b/eslint-local-rules/index.js
@@ -1,3 +1,16 @@
+import disallowSideEffects from './disallowSideEffects.js'
+import disallowEnumExports from './disallowEnumExports.js'
+import disallowSpecImport from './disallowSpecImport.js'
+import disallowProtectedDirectoryImport from './disallowProtectedDirectoryImport.cjs'
+import disallowTestImportExportFromSrc from './disallowTestImportExportFromSrc.js'
+import disallowZoneJsPatchedValues from './disallowZoneJsPatchedValues.js'
+import disallowUrlConstructorPatchValues from './disallowUrlConstructorPatchValues.js'
+import disallowGenericUtils from './disallowGenericUtils.js'
+import disallowNonScripts from './disallowNonScripts.js'
+import enforceProdDepsImports from './enforceProdDepsImports.cjs'
+import secureCommandExecution from './secureCommandExecution.js'
+import monitorUntilCommentRules from './monitorUntilCommentRules.js'
+
 // Declare the local rules used by the Browser SDK
 //
 // See https://eslint.org/docs/developer-guide/working-with-rules for documentation on how to write
@@ -6,17 +19,17 @@
 // You can use https://astexplorer.net/ to explore the parsed data structure of a code snippet.
 // Choose '@typescript-eslint/parser' as a parser to have the exact same structure as our ESLint
 // parser.
-module.exports = {
-  'disallow-side-effects': require('./disallowSideEffects'),
-  'disallow-enum-exports': require('./disallowEnumExports'),
-  'disallow-spec-import': require('./disallowSpecImport'),
-  'disallow-protected-directory-import': require('./disallowProtectedDirectoryImport'),
-  'disallow-test-import-export-from-src': require('./disallowTestImportExportFromSrc'),
-  'disallow-zone-js-patched-values': require('./disallowZoneJsPatchedValues'),
-  'disallow-url-constructor-patched-values': require('./disallowUrlConstructorPatchValues.js'),
-  'disallow-generic-utils': require('./disallowGenericUtils'),
-  'disallow-non-scripts': require('./disallowNonScripts'),
-  'enforce-prod-deps-imports': require('./enforceProdDepsImports.js'),
-  'secure-command-execution': require('./secureCommandExecution'),
-  ...require('./monitorUntilCommentRules'),
+export default {
+  'disallow-side-effects': disallowSideEffects,
+  'disallow-enum-exports': disallowEnumExports,
+  'disallow-spec-import': disallowSpecImport,
+  'disallow-protected-directory-import': disallowProtectedDirectoryImport,
+  'disallow-test-import-export-from-src': disallowTestImportExportFromSrc,
+  'disallow-zone-js-patched-values': disallowZoneJsPatchedValues,
+  'disallow-url-constructor-patched-values': disallowUrlConstructorPatchValues,
+  'disallow-generic-utils': disallowGenericUtils,
+  'disallow-non-scripts': disallowNonScripts,
+  'enforce-prod-deps-imports': enforceProdDepsImports,
+  'secure-command-execution': secureCommandExecution,
+  ...monitorUntilCommentRules,
 }
diff --git a/eslint-local-rules/monitorUntilCommentRules.js b/eslint-local-rules/monitorUntilCommentRules.js
@@ -1,7 +1,7 @@
 const METHODS_TO_CHECK = ['addTelemetryDebug', 'addTelemetryMetrics']
 const MONITOR_COMMENT_FORMAT = /^\s*monitor-until: (\d{4}-\d{2}-\d{2}|forever)/
 
-module.exports = {
+export default {
   'enforce-monitor-until-comment': {
     meta: {
       docs: {
diff --git a/eslint-local-rules/secureCommandExecution.js b/eslint-local-rules/secureCommandExecution.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   meta: {
     docs: {
       description: 'Check command execution within nodejs scripts',
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -329,7 +329,7 @@ export default tseslint.config(
 
   {
     // JS files. Allow weaker typings since TS can't infer types as accurately as TS files.
-    files: ['**/*.js', '**/*.mjs'],
+    files: ['**/*.{js,mjs,cjs}'],
     rules: {
       '@typescript-eslint/no-unsafe-call': 'off',
       '@typescript-eslint/no-unsafe-return': 'off',
@@ -418,7 +418,7 @@ export default tseslint.config(
     files: [
       'scripts/**',
       'test/**/*.js',
-      'eslint-local-rules/**/*.js',
+      'eslint-local-rules/**/*.{js,cjs}',
       'eslint.config.mjs',
       'packages/*/scripts/**/*.js',
     ],
@@ -431,9 +431,9 @@ export default tseslint.config(
   },
 
   {
-    files: ['**/webpack.*.ts'],
+    files: ['**/webpack.*.{ts,mts}', 'eslint-local-rules/**/*.js'],
     rules: {
-      // Webpack configuration files are expected to use a default export.
+      // Webpack configuration files and eslint rules files are expected to use a default export.
       'import/no-default-export': 'off',
     },
   },
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "developer-extension",
     "performances"
   ],
+  "type": "module",
   "scripts": {
     "postinstall": "scripts/cli init_submodule",
     "build": "lerna run build --stream",
diff --git a/packages/flagging/webpack.config.mts b/packages/flagging/webpack.config.mts
@@ -2,7 +2,6 @@ import path from 'path'
 import type webpack from 'webpack'
 import webpackBase from '../../webpack.base.ts'
 
-// eslint-disable-next-line import/no-default-export
 export default (_env: unknown, argv: { mode?: webpack.Configuration['mode'] }) =>
   webpackBase({
     mode: argv.mode,
diff --git a/packages/logs/webpack.config.mts b/packages/logs/webpack.config.mts
@@ -2,7 +2,6 @@ import path from 'path'
 import type webpack from 'webpack'
 import webpackBase from '../../webpack.base.ts'
 
-// eslint-disable-next-line import/no-default-export
 export default (_env: unknown, argv: { mode?: webpack.Configuration['mode'] }) =>
   webpackBase({
     mode: argv.mode,
diff --git a/packages/rum-slim/webpack.config.mts b/packages/rum-slim/webpack.config.mts
@@ -2,7 +2,6 @@ import path from 'path'
 import type webpack from 'webpack'
 import webpackBase from '../../webpack.base.ts'
 
-// eslint-disable-next-line import/no-default-export
 export default (_env: unknown, argv: { mode?: webpack.Configuration['mode'] }) =>
   webpackBase({
     mode: argv.mode,
diff --git a/packages/rum/webpack.config.mts b/packages/rum/webpack.config.mts
@@ -2,7 +2,6 @@ import path from 'path'
 import type webpack from 'webpack'
 import webpackBase from '../../webpack.base.ts'
 
-// eslint-disable-next-line import/no-default-export
 export default (_env: unknown, argv: { mode?: webpack.Configuration['mode'] }) =>
   webpackBase({
     mode: argv.mode,
diff --git a/packages/worker/webpack.config.mts b/packages/worker/webpack.config.mts
@@ -2,7 +2,6 @@ import path from 'path'
 import type webpack from 'webpack'
 import webpackBase from '../../webpack.base.ts'
 
-// eslint-disable-next-line import/no-default-export
 export default (_env: unknown, argv: { mode?: webpack.Configuration['mode'] }) =>
   webpackBase({
     mode: argv.mode,
diff --git a/scripts/package.json b/scripts/package.json
diff --git a/webpack.base.ts b/webpack.base.ts
@@ -6,7 +6,6 @@ import { buildEnvKeys, getBuildEnvValue } from './scripts/lib/buildEnv.ts'
 
 const tsconfigPath = path.join(import.meta.dirname, 'tsconfig.webpack.json')
 
-// eslint-disable-next-line import/no-default-export
 export default ({
   entry,
   mode,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module.exports = {`
	`1`	`+export default {`
`2`	`2`	`meta: {`
`3`	`3`	`docs: {`
`4`	`4`	`description: 'Disallow JS files that are not used as a "script"',`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const PROBLEMATIC_IDENTIFIERS = {`
`19`	`19`	removeEventListener: 'Use `addEventListener().stop` from @datadog/browser-core instead',
`20`	`20`	`}`
`21`	`21`
`22`		`-module.exports = {`
	`22`	`+export default {`
`23`	`23`	`meta: {`
`24`	`24`	`docs: {`
`25`	`25`	`description: 'Disallow problematic ZoneJs patched values.',`