From 59285f1fcf78490d3f51957b7ca5b1b3b5d0cbb4 Mon Sep 17 00:00:00 2001 From: Elena Shostak Date: Wed, 20 Nov 2024 10:15:45 +0100 Subject: [PATCH] Made types.eslint.config.template a cjs file by default --- .gitignore | 1 + src/dev/eslint/run_eslint_with_types.ts | 7 ++----- ...config.template.js => types.eslint.config.template.cjs} | 0 3 files changed, 3 insertions(+), 5 deletions(-) rename src/dev/eslint/{types.eslint.config.template.js => types.eslint.config.template.cjs} (100%) diff --git a/.gitignore b/.gitignore index 9bda927a92b6a..ac9d52c2a0a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ target *.iml *.log types.eslint.config.js +types.eslint.config.cjs __tmp__ # Ignore example plugin builds diff --git a/src/dev/eslint/run_eslint_with_types.ts b/src/dev/eslint/run_eslint_with_types.ts index 317eb1933d041..0a872a248dc5a 100644 --- a/src/dev/eslint/run_eslint_with_types.ts +++ b/src/dev/eslint/run_eslint_with_types.ts @@ -28,7 +28,7 @@ export function runEslintWithTypes() { async ({ log, flags }) => { const ignoreFilePath = Path.resolve(REPO_ROOT, '.eslintignore'); const configTemplate = Fs.readFileSync( - Path.resolve(__dirname, 'types.eslint.config.template.js'), + Path.resolve(__dirname, 'types.eslint.config.template.cjs'), 'utf8' ); @@ -65,10 +65,7 @@ export function runEslintWithTypes() { const failures = await Rx.lastValueFrom( Rx.from(projects).pipe( mergeMap(async (project) => { - const configFilePath = Path.resolve( - project.directory, - `types.eslint.config.${project.isEsm ? 'cjs' : 'js'}` - ); + const configFilePath = Path.resolve(project.directory, 'types.eslint.config.cjs'); Fs.writeFileSync( configFilePath, diff --git a/src/dev/eslint/types.eslint.config.template.js b/src/dev/eslint/types.eslint.config.template.cjs similarity index 100% rename from src/dev/eslint/types.eslint.config.template.js rename to src/dev/eslint/types.eslint.config.template.cjs