Revert "feat(linter): add generator for converting to flat config (#1… (

#18628)
nrwl · Aug 14, 2023 · 11249e9 · 11249e9 · vercel · Aug 14, 2023
1 parent d1f76ff
commit 11249e9
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 1,879 deletions.
diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
@@ -6384,14 +6384,6 @@
                 "children": [],
                 "isExternal": false,
                 "disableCollapsible": false
-              },
-              {
-                "id": "convert-to-flat-config",
-                "path": "/packages/linter/generators/convert-to-flat-config",
-                "name": "convert-to-flat-config",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
               }
             ],
             "isExternal": false,

diff --git a/docs/generated/manifests/packages.json b/docs/generated/manifests/packages.json
@@ -1140,15 +1140,6 @@
         "originalFilePath": "/packages/linter/src/generators/workspace-rule/schema.json",
         "path": "/packages/linter/generators/workspace-rule",
         "type": "generator"
-      },
-      "/packages/linter/generators/convert-to-flat-config": {
-        "description": "Convert an Nx workspace to a Flat ESLint config.",
-        "file": "generated/packages/linter/generators/convert-to-flat-config.json",
-        "hidden": false,
-        "name": "convert-to-flat-config",
-        "originalFilePath": "/packages/linter/src/generators/convert-to-flat-config/schema.json",
-        "path": "/packages/linter/generators/convert-to-flat-config",
-        "type": "generator"
       }
     },
     "path": "/packages/linter"

diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
@@ -1123,15 +1123,6 @@
         "originalFilePath": "/packages/linter/src/generators/workspace-rule/schema.json",
         "path": "linter/generators/workspace-rule",
         "type": "generator"
-      },
-      {
-        "description": "Convert an Nx workspace to a Flat ESLint config.",
-        "file": "generated/packages/linter/generators/convert-to-flat-config.json",
-        "hidden": false,
-        "name": "convert-to-flat-config",
-        "originalFilePath": "/packages/linter/src/generators/convert-to-flat-config/schema.json",
-        "path": "linter/generators/convert-to-flat-config",
-        "type": "generator"
       }
     ],
     "githubRoot": "https://github.com/nrwl/nx/blob/master",

diff --git a/docs/generated/packages/linter/generators/convert-to-flat-config.json b/docs/generated/packages/linter/generators/convert-to-flat-config.json
diff --git a/docs/shared/reference/sitemap.md b/docs/shared/reference/sitemap.md
@@ -413,7 +413,6 @@
     - [generators](/packages/linter/generators)
       - [workspace-rules-project](/packages/linter/generators/workspace-rules-project)
       - [workspace-rule](/packages/linter/generators/workspace-rule)
-      - [convert-to-flat-config](/packages/linter/generators/convert-to-flat-config)
   - [nest](/packages/nest)
     - [documents](/packages/nest/documents)
       - [Overview](/packages/nest/documents/overview)

diff --git a/e2e/linter/src/linter.test.ts b/e2e/linter/src/linter.test.ts
@@ -1,15 +1,12 @@
 import * as path from 'path';
 import {
-  checkFilesDoNotExist,
   checkFilesExist,
   cleanupProject,
   createFile,
-  getSelectedPackageManager,
   newProject,
   readFile,
   readJson,
   runCLI,
-  runCreateWorkspace,
   uniq,
   updateFile,
   updateJson,
@@ -540,78 +537,6 @@ describe('Linter', () => {
     });
   });
 
-  describe('Flat config', () => {
-    const packageManager = getSelectedPackageManager() || 'pnpm';
-
-    afterEach(() => cleanupProject());
-
-    it('should convert integrated to flat config', () => {
-      const myapp = uniq('myapp');
-      const mylib = uniq('mylib');
-
-      runCreateWorkspace(myapp, {
-        preset: 'react-monorepo',
-        appName: myapp,
-        style: 'css',
-        packageManager,
-        bundler: 'vite',
-        e2eTestRunner: 'none',
-      });
-      runCLI(`generate @nx/js:lib ${mylib}`);
-
-      // migrate to flat structure
-      runCLI(`generate @nx/linter:convert-to-flat-config`);
-      checkFilesExist(
-        'eslint.config.js',
-        `apps/${myapp}/eslint.config.js`,
-        `libs/${mylib}/eslint.config.js`
-      );
-      checkFilesDoNotExist(
-        '.eslintrc.json',
-        `apps/${myapp}/.eslintrc.json`,
-        `libs/${mylib}/.eslintrc.json`
-      );
-
-      const outFlat = runCLI(`affected -t lint`, {
-        silenceError: true,
-      });
-      expect(outFlat).toContain('All files pass linting');
-    }, 1000000);
-
-    it('should convert standalone to flat config', () => {
-      const myapp = uniq('myapp');
-      const mylib = uniq('mylib');
-
-      runCreateWorkspace(myapp, {
-        preset: 'react-standalone',
-        appName: myapp,
-        style: 'css',
-        packageManager,
-        bundler: 'vite',
-        e2eTestRunner: 'none',
-      });
-      runCLI(`generate @nx/js:lib ${mylib}`);
-
-      // migrate to flat structure
-      runCLI(`generate @nx/linter:convert-to-flat-config`);
-      checkFilesExist(
-        'eslint.config.js',
-        `${mylib}/eslint.config.js`,
-        'eslint.base.config.js'
-      );
-      checkFilesDoNotExist(
-        '.eslintrc.json',
-        `${mylib}/.eslintrc.json`,
-        '.eslintrc.base.json'
-      );
-
-      const outFlat = runCLI(`affected -t lint`, {
-        silenceError: true,
-      });
-      expect(outFlat).toContain('All files pass linting');
-    }, 1000000);
-  });
-
   describe('Root projects migration', () => {
     beforeEach(() => newProject());
     afterEach(() => cleanupProject());

diff --git a/package.json b/package.json
@@ -46,8 +46,6 @@
     "@babel/preset-react": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@eslint/eslintrc": "^2.1.1",
-    "@eslint/js": "^8.46.0",
     "@floating-ui/react": "0.19.2",
     "@jest/reporters": "^29.4.1",
     "@jest/test-result": "^29.4.1",

diff --git a/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap b/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
@@ -95,7 +95,6 @@ exports[`workspace move to nx layout should create nx.json 1`] = `
       "!{projectRoot}/**/*.spec.[jt]s",
       "!{projectRoot}/karma.conf.js",
       "!{projectRoot}/.eslintrc.json",
-      "!{projectRoot}/eslint.config.js",
     ],
     "sharedGlobals": [],
   },
@@ -119,7 +118,6 @@ exports[`workspace move to nx layout should create nx.json 1`] = `
       "inputs": [
         "default",
         "{workspaceRoot}/.eslintrc.json",
-        "{workspaceRoot}/eslint.config.js",
       ],
     },
     "test": {

diff --git a/packages/angular/src/generators/ng-add/utilities/workspace.ts b/packages/angular/src/generators/ng-add/utilities/workspace.ts
@@ -76,9 +76,7 @@ export function createNxJson(
               '!{projectRoot}/karma.conf.js',
             ]
           : []),
-        ...(targets.lint
-          ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
-          : []),
+        targets.lint ? '!{projectRoot}/.eslintrc.json' : undefined,
       ].filter(Boolean),
     },
     targetDefaults: {
@@ -93,11 +91,7 @@ export function createNxJson(
         : undefined,
       lint: targets.lint
         ? {
-            inputs: [
-              'default',
-              '{workspaceRoot}/.eslintrc.json',
-              '{workspaceRoot}/eslint.config.js',
-            ],
+            inputs: ['default', '{workspaceRoot}/.eslintrc.json'],
           }
         : undefined,
       e2e: targets.e2e

diff --git a/packages/linter/generators.json b/packages/linter/generators.json
@@ -25,11 +25,6 @@
       "factory": "./src/generators/workspace-rule/workspace-rule#lintWorkspaceRuleGenerator",
       "schema": "./src/generators/workspace-rule/schema.json",
       "description": "Create a new Workspace ESLint rule."
-    },
-    "convert-to-flat-config": {
-      "factory": "./src/generators/convert-to-flat-config/generator",
-      "schema": "./src/generators/convert-to-flat-config/schema.json",
-      "description": "Convert an Nx workspace to a Flat ESLint config."
     }
   }
 }
diff --git a/packages/linter/package.json b/packages/linter/package.json
@@ -37,8 +37,7 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "@nx/devkit": "file:../devkit",
-    "@nx/js": "file:../js",
-    "typescript": "~5.1.3"
+    "@nx/js": "file:../js"
   },
   "peerDependenciesMeta": {
     "eslint": {

diff --git a/packages/linter/src/executors/eslint/lint.impl.ts b/packages/linter/src/executors/eslint/lint.impl.ts
@@ -130,13 +130,10 @@ Please see https://nx.dev/guides/eslint for full guidance on how to resolve this
       .filter((pattern) => !!pattern)
       .map((pattern) => `- '${pattern}'`);
     if (ignoredPatterns.length) {
-      const ignoreSection = useFlatConfig
-        ? `'ignores' configuration`
-        : `'.eslintignore' file`;
       throw new Error(
         `All files matching the following patterns are ignored:\n${ignoredPatterns.join(
           '\n'
-        )}\n\nPlease check your ${ignoreSection}.`
+        )}\n\nPlease check your '.eslintignore' file.`
       );
     }
     throw new Error(