From 65c7a03aefdb40babf08baa5a4e0a37548566f25 Mon Sep 17 00:00:00 2001 From: Miroslav Jonas Date: Mon, 16 Oct 2023 10:57:38 +0200 Subject: [PATCH] fix(linter): fix outdated imports --- .../src/generators/federate-module/federate-module.spec.ts | 4 ++-- .../storybook-configuration/storybook-utilities.spec.ts | 6 +++--- .../storybook-configuration/configuration.spec.ts | 2 +- .../nuxt/src/generators/storybook-configuration/schema.d.ts | 2 +- packages/plugin/src/generators/executor/executor.spec.ts | 2 +- packages/plugin/src/generators/generator/generator.spec.ts | 2 +- packages/plugin/src/generators/migration/migration.spec.ts | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/angular/src/generators/federate-module/federate-module.spec.ts b/packages/angular/src/generators/federate-module/federate-module.spec.ts index 3180291799c15f..b9912463850c1d 100644 --- a/packages/angular/src/generators/federate-module/federate-module.spec.ts +++ b/packages/angular/src/generators/federate-module/federate-module.spec.ts @@ -1,9 +1,9 @@ -import { getProjects, Tree } from '@nx/devkit'; +import { getProjects } from '@nx/devkit'; import { Schema } from './schema'; import { Schema as remoteSchma } from '../remote/schema'; import { federateModuleGenerator } from './federate-module'; import { createTreeWithEmptyWorkspace } from 'nx/src/devkit-testing-exports'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import remoteGenerator from '../remote/remote'; import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners'; diff --git a/packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts b/packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts index 5b42d24f0c6245..ee1e0cc2ac8f7d 100644 --- a/packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts +++ b/packages/angular/src/generators/storybook-configuration/storybook-utilities.spec.ts @@ -9,7 +9,7 @@ import * as targetVariations from '@nx/storybook/src/utils/test-configs/differen import libraryGenerator from '../library/library'; import componentGenerator from '../component/component'; import storybookConfigurationGenerator from '../storybook-configuration/storybook-configuration'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; // nested code imports graph from the repo, which might have innacurate graph version jest.mock('nx/src/project-graph/project-graph', () => ({ @@ -75,13 +75,13 @@ describe('testing utilities', () => { ` import type { Meta } from '@storybook/react'; import { Button } from './button'; - + const Story: Meta = { component: Button, title: 'Layout/Texts/Button', }; export default Story; - + export const Primary = { args: {}, }; diff --git a/packages/nuxt/src/generators/storybook-configuration/configuration.spec.ts b/packages/nuxt/src/generators/storybook-configuration/configuration.spec.ts index 6ebc14fdc8d0b1..2c18fc206ac6e4 100644 --- a/packages/nuxt/src/generators/storybook-configuration/configuration.spec.ts +++ b/packages/nuxt/src/generators/storybook-configuration/configuration.spec.ts @@ -1,6 +1,6 @@ import { logger, Tree } from '@nx/devkit'; import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import applicationGenerator from '../application/application'; import componentGenerator from '../component/component'; import storybookConfigurationGenerator from './configuration'; diff --git a/packages/nuxt/src/generators/storybook-configuration/schema.d.ts b/packages/nuxt/src/generators/storybook-configuration/schema.d.ts index bfab779db2beb7..fa17f844b9f0a0 100644 --- a/packages/nuxt/src/generators/storybook-configuration/schema.d.ts +++ b/packages/nuxt/src/generators/storybook-configuration/schema.d.ts @@ -1,4 +1,4 @@ -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; export interface Schema { name: string; diff --git a/packages/plugin/src/generators/executor/executor.spec.ts b/packages/plugin/src/generators/executor/executor.spec.ts index 5af728505ae477..3215fef82ad50f 100644 --- a/packages/plugin/src/generators/executor/executor.spec.ts +++ b/packages/plugin/src/generators/executor/executor.spec.ts @@ -4,7 +4,7 @@ import { executorGenerator } from './executor'; import { pluginGenerator } from '../plugin/plugin'; import { libraryGenerator as jsLibraryGenerator } from '@nx/js'; import { setCwd } from '@nx/devkit/internal-testing-utils'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; describe('NxPlugin Executor Generator', () => { let tree: Tree; diff --git a/packages/plugin/src/generators/generator/generator.spec.ts b/packages/plugin/src/generators/generator/generator.spec.ts index 722fa0eacbc450..b2543f6c377ee6 100644 --- a/packages/plugin/src/generators/generator/generator.spec.ts +++ b/packages/plugin/src/generators/generator/generator.spec.ts @@ -8,7 +8,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { libraryGenerator as jsLibraryGenerator } from '@nx/js'; import { pluginGenerator } from '../plugin/plugin'; import { generatorGenerator } from './generator'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; import { setCwd } from '@nx/devkit/internal-testing-utils'; describe('NxPlugin Generator Generator', () => { diff --git a/packages/plugin/src/generators/migration/migration.spec.ts b/packages/plugin/src/generators/migration/migration.spec.ts index a518124f385d2a..2e1d0ac3f4599a 100644 --- a/packages/plugin/src/generators/migration/migration.spec.ts +++ b/packages/plugin/src/generators/migration/migration.spec.ts @@ -3,7 +3,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; import { migrationGenerator } from './migration'; import { pluginGenerator } from '../plugin/plugin'; import { setCwd } from '@nx/devkit/internal-testing-utils'; -import { Linter } from '@nx/linter'; +import { Linter } from '@nx/eslint'; describe('NxPlugin migration generator', () => { let tree: Tree;