miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(nextjs): update migration to handle projects without eslintrc (#20932)

Browse Source
This commit is contained in:
Jack Hsu 2023-12-27 14:03:24 -05:00 committed by GitHub
parent cbb26cb368
commit d1a2d455a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/next/src/migrations/update-17-2-7/remove-eslint-rules-patch.spec.ts
View File

@ -1,8 +1,7 @@
import { Tree, addProjectConfiguration, writeJson } from '@nx/devkit'; import { addProjectConfiguration, readJson, Tree, writeJson } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from 'nx/src/devkit-testing-exports'; import { createTreeWithEmptyWorkspace } from 'nx/src/devkit-testing-exports';
import update from './remove-eslint-rules-patch'; import update from './remove-eslint-rules-patch';
import { readJson } from '@nx/devkit';
describe('update-nx-next-dependency', () => { describe('update-nx-next-dependency', () => {
let tree: Tree; let tree: Tree;
@ -11,6 +10,16 @@ describe('update-nx-next-dependency', () => {
tree = createTreeWithEmptyWorkspace(); tree = createTreeWithEmptyWorkspace();
}); });
it('should handle projects without eslintrc file', async () => {
tree.write('.eslintrc.json', '{}');
addProjectConfiguration(tree, 'my-pkg', {
root: 'packages/my-pkg',
});
await expect(update(tree)).resolves.not.toThrow();
});
it('should remove @next/next/no-html-link-for-pages in json configs', async () => { it('should remove @next/next/no-html-link-for-pages in json configs', async () => {
tree.write('.eslintrc.json', '{}'); tree.write('.eslintrc.json', '{}');

8
packages/next/src/migrations/update-17-2-7/remove-eslint-rules-patch.ts
View File

@ -1,9 +1,13 @@
import { Tree, formatFiles, getProjects } from '@nx/devkit'; import { formatFiles, getProjects, Tree } from '@nx/devkit';
import { updateOverrideInLintConfig } from '@nx/eslint/src/generators/utils/eslint-file'; import {
isEslintConfigSupported,
updateOverrideInLintConfig,
} from '@nx/eslint/src/generators/utils/eslint-file';
export default async function update(tree: Tree) { export default async function update(tree: Tree) {
const projects = getProjects(tree); const projects = getProjects(tree);
projects.forEach((project) => { projects.forEach((project) => {
if (!isEslintConfigSupported(tree, project.root)) return;
updateOverrideInLintConfig( updateOverrideInLintConfig(
tree, tree,
project.root, project.root,