Skip to content

Commit af3f9ac

Browse files
committed
fix(linter): fix generator '@nx/eslint:convert-to-flat-config' on windows
1 parent b51676a commit af3f9ac

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

packages/eslint/src/generators/convert-to-flat-config/converters/json-converter.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Tree, readJson } from '@nx/devkit';
22
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
33
import { convertEslintJsonToFlatConfig } from './json-converter';
4+
import { EOL } from 'node:os';
45

56
describe('convertEslintJsonToFlatConfig', () => {
67
let tree: Tree;
@@ -63,7 +64,7 @@ describe('convertEslintJsonToFlatConfig', () => {
6364
})
6465
);
6566

66-
tree.write('.eslintignore', 'node_modules\nsomething/else');
67+
tree.write('.eslintignore', `node_modules${EOL}something/else`);
6768

6869
const { content } = convertEslintJsonToFlatConfig(
6970
tree,
@@ -227,7 +228,7 @@ describe('convertEslintJsonToFlatConfig', () => {
227228
})
228229
);
229230

230-
tree.write('mylib/.eslintignore', 'node_modules\nsomething/else');
231+
tree.write('mylib/.eslintignore', `node_modules${EOL}something/else`);
231232

232233
const { content } = convertEslintJsonToFlatConfig(
233234
tree,
@@ -376,7 +377,7 @@ describe('convertEslintJsonToFlatConfig', () => {
376377
})
377378
);
378379

379-
tree.write('.eslintignore', 'node_modules\nsomething/else');
380+
tree.write('.eslintignore', `node_modules${EOL}something/else`);
380381

381382
const { content } = convertEslintJsonToFlatConfig(
382383
tree,
@@ -537,7 +538,7 @@ describe('convertEslintJsonToFlatConfig', () => {
537538
})
538539
);
539540

540-
tree.write('mylib/.eslintignore', 'node_modules\nsomething/else');
541+
tree.write('mylib/.eslintignore', `node_modules${EOL}something/else`);
541542

542543
const { content } = convertEslintJsonToFlatConfig(
543544
tree,

packages/eslint/src/generators/convert-to-flat-config/converters/json-converter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from '../../utils/flat-config/ast-utils';
1313
import { getPluginImport } from '../../utils/eslint-file';
1414
import { mapFilePath } from '../../utils/flat-config/path-utils';
15+
import { EOL } from 'node:os';
1516

1617
/**
1718
* Converts an ESLint JSON config to a flat config.
@@ -185,7 +186,7 @@ export function convertEslintJsonToFlatConfig(
185186
if (tree.exists(ignorePath)) {
186187
const patterns = tree
187188
.read(ignorePath, 'utf-8')
188-
.split('\n')
189+
.split(EOL)
189190
.filter((line) => line.length > 0 && line !== 'node_modules')
190191
.map((path) => mapFilePath(path));
191192
if (patterns.length > 0) {

0 commit comments

Comments
 (0)