Merge branch 'master' into develop

.github/workflows/codecov.yml

@@ -19,4 +19,4 @@ jobs:
       - name: Collect coverage
         run: npm run test:coverage
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5

__tests__/categories/js/eslint/eslint.entrypoint.test.ts

@@ -2,6 +2,7 @@ import * as fs from 'src/utils/fs';
 import * as npm from 'src/utils/npm';
 import * as mutation from 'src/utils/mutation';
 import * as config from 'src/categories/js/eslint/eslint.config';
+import * as javascript from 'src/utils/javascript';
 import { eslint } from 'src/categories/js/eslint/eslint.entrypoint';
 import { createConfig } from './eslint-test.utils';
 import { Config } from 'src/categories/js/eslint/config/config.interface';
@@ -18,6 +19,14 @@ const mutationMocked = jest.mocked(mutation);
 jest.mock('src/categories/js/eslint/eslint.config');
 const configMocked = jest.mocked(config);
 
+// we need to mock prettier because it doesn't work with jest
+// TypeError: A dynamic import callback was invoked without --experimental-vm-modules
+// https://github.com/prettier/prettier/issues/15769
+jest.mock('src/utils/javascript', () => ({
+  format: jest.fn().mockImplementation(async (config) => config),
+}));
+const javascriptMocked = jest.mocked(javascript);
+
 beforeEach(() => {
   jest.clearAllMocks();
 });
@@ -57,15 +66,12 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `export default [
-  {
-    ignores: [
-      '__test__'
-    ],
-  }
+{ignores: ["__test__"]},
 ];`;
 
     await eslint();
 
+    expect(javascriptMocked.format).toHaveBeenCalledWith(configFile);
     expect(fsMocked.addFileToRoot).toHaveBeenCalledWith('eslint.config.mjs', configFile);
   });
 
@@ -74,12 +80,11 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `export default [
-  {\n
-  }
 ];`;
 
     await eslint();
 
+    expect(javascriptMocked.format).toHaveBeenCalledWith(configFile);
     expect(fsMocked.addFileToRoot).toHaveBeenCalledWith('eslint.config.mjs', configFile);
   });
 
@@ -94,16 +99,12 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `export default [
-  {
-    languageOptions: {
-      globals: {\n
-      }
-    },
-  }
+{languageOptions: {}}
 ];`;
 
     await eslint();
 
+    expect(javascriptMocked.format).toHaveBeenCalledWith(configFile);
     expect(fsMocked.addFileToRoot).toHaveBeenCalledWith('eslint.config.mjs', configFile);
   });
 
@@ -114,14 +115,13 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `export default [
-  __test1__,
-  __test2__,
-  {\n
-  }
+__test1__,
+__test2__,
 ];`;
 
     await eslint();
 
+    expect(javascriptMocked.format).toHaveBeenCalledWith(configFile);
     expect(fsMocked.addFileToRoot).toHaveBeenCalledWith('eslint.config.mjs', configFile);
   });
 
@@ -149,32 +149,15 @@ describe('eslint', () => {
     configMocked.getConfig.mockReturnValueOnce(config);
 
     const configFile = `// @ts-check
-import globals from "globals";\n
+import globals from "globals";
 export default tseslint.config(
-  {
-    files: ['src/**/*.ts'],
-    ignores: [
-      'node_modules'
-    ],
-    languageOptions: {
-      globals: {
-        ...globals.window
-      },
-      parserOptions: {
-        ecmaVersion: 2020
-      }
-    },
-    plugins: { 
-      '@typescript-eslint': eslintPluginTs
-    },
-    rules: {
-      'no-console': 'warn'
-    },
-  }
+{ignores: ["node_modules"]},
+{files: ["src/**/*.ts"],languageOptions: {globals: {...globals.window},parserOptions: {"ecmaVersion":2020}},plugins: {'@typescript-eslint': eslintPluginTs},rules: {"no-console":"warn"}}
 );`;
 
     await eslint();
 
+    expect(javascriptMocked.format).toHaveBeenCalledWith(configFile);
     expect(fsMocked.addFileToRoot).toHaveBeenCalledWith('eslint.config.mjs', configFile);
   });
 

__tests__/setup-after-env.ts

@@ -0,0 +1,4 @@
+// we need to mock prettier in all tests because it doesn't work with jest
+// TypeError: A dynamic import callback was invoked without --experimental-vm-modules
+// https://github.com/prettier/prettier/issues/15769
+jest.mock('prettier', () => jest.fn());

__tests__/utils/javascript.test.ts

@@ -0,0 +1,31 @@
+import prettier from 'prettier';
+import { getConfig } from 'src/categories/js/prettier/prettier.config';
+import { defaultConfig } from 'src/categories/js/prettier/config/default.config';
+import { format } from 'src/utils/javascript';
+
+// we need to mock prettier because it doesn't work with jest
+// TypeError: A dynamic import callback was invoked without --experimental-vm-modules
+// https://github.com/prettier/prettier/issues/15769
+jest.mock('prettier', () => ({
+  format: jest.fn(),
+}));
+const prettierMocked = jest.mocked(prettier);
+
+jest.mock('src/categories/js/prettier/prettier.config', () => ({ getConfig: jest.fn() }));
+const getConfigMocked = jest.mocked(getConfig);
+
+describe('format', () => {
+  test('formats input with default config', async () => {
+    const input = `const foo   =    "bar"`;
+    const formatted = `const foo = 'bar';`;
+
+    getConfigMocked.mockImplementation(() => ({ config: { printWidth: 90 } }) as typeof defaultConfig);
+    prettierMocked.format.mockResolvedValueOnce(formatted);
+
+    const actual = await format(input);
+    const expected = formatted;
+
+    expect(actual).toBe(expected);
+    expect(prettierMocked.format).toHaveBeenCalledWith(input, { parser: 'typescript', printWidth: 90 });
+  });
+});

jest.config.cjs

@@ -9,7 +9,8 @@ module.exports = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   moduleDirectories: ['<rootDir>', 'node_modules'],
-  testRegex: '.*\.(spec|test)\.ts$',
+  testRegex: '.*.(spec|test).ts$',
   collectCoverageFrom: ['src/**/*.ts'],
   passWithNoTests: true,
+  setupFilesAfterEnv: ['./__tests__/setup-after-env.ts'],
 };

package.json

@@ -68,7 +68,6 @@
     "husky": "^9.1.6",
     "jest": "^29.7.0",
     "lint-staged": "^15.2.10",
-    "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "rollup": "^3.29.5",
     "rollup-plugin-typescript2": "^0.36.0",
@@ -83,7 +82,8 @@
   },
   "dependencies": {
     "inquirer": "8.2.4",
-    "ora": "5.4.1"
+    "ora": "5.4.1",
+    "prettier": "^3.3.3"
   },
   "lint-staged": {
     "*.ts": [