@@ -85,8 +85,8 @@ describe('react-native:component-story', () => {
);
};
-
- export default Test;
+
+ export default Test;
`
);
@@ -117,7 +117,7 @@ describe('react-native:component-story', () => {
`import React from 'react';
import { View, Text } from 'react-native';
-
+
export function Test() {
return (
@@ -194,8 +194,8 @@ describe('react-native:component-story', () => {
);
};
-
- export default Test;
+
+ export default Test;
`
);
@@ -337,12 +337,12 @@ describe('react-native:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
${config.src}
`
);
diff --git a/packages/react-native/src/generators/library/library.spec.ts b/packages/react-native/src/generators/library/library.spec.ts
index 32cfa2a57a761b..77eb8883ce35f7 100644
--- a/packages/react-native/src/generators/library/library.spec.ts
+++ b/packages/react-native/src/generators/library/library.spec.ts
@@ -6,7 +6,7 @@ import {
} from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import libraryGenerator from './library';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { Schema } from './schema';
describe('lib', () => {
@@ -34,7 +34,7 @@ describe('lib', () => {
expect(projectConfiguration.root).toEqual('my-lib');
expect(projectConfiguration.targets.build).toBeUndefined();
expect(projectConfiguration.targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
@@ -155,7 +155,7 @@ describe('lib', () => {
expect(projectConfiguration.root).toEqual('my-dir');
expect(projectConfiguration.targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-dir/**/*.{ts,tsx,js,jsx}'],
@@ -225,7 +225,7 @@ describe('lib', () => {
const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
expect(projectConfiguration.targets.test).toBeUndefined();
expect(projectConfiguration.targets.lint).toMatchObject({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
options: {
lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
},
diff --git a/packages/react-native/src/generators/library/schema.d.ts b/packages/react-native/src/generators/library/schema.d.ts
index b4ae7b807f59d1..e515465f19982b 100644
--- a/packages/react-native/src/generators/library/schema.d.ts
+++ b/packages/react-native/src/generators/library/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
/**
* Same as the @nx/react library schema, except it removes keys: style, component, routing, appProject
diff --git a/packages/react-native/src/generators/stories/stories-app.spec.ts b/packages/react-native/src/generators/stories/stories-app.spec.ts
index 52a4ae7487b084..6b971efac5e3b4 100644
--- a/packages/react-native/src/generators/stories/stories-app.spec.ts
+++ b/packages/react-native/src/generators/stories/stories-app.spec.ts
@@ -2,7 +2,7 @@ import { Tree } from '@nx/devkit';
import storiesGenerator from './stories';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import applicationGenerator from '../application/application';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { reactNativeComponentGenerator } from '../component/component';
describe('react:stories for applications', () => {
diff --git a/packages/react-native/src/generators/stories/stories-lib.spec.ts b/packages/react-native/src/generators/stories/stories-lib.spec.ts
index 8c16586ab63378..d9337b4069cd82 100644
--- a/packages/react-native/src/generators/stories/stories-lib.spec.ts
+++ b/packages/react-native/src/generators/stories/stories-lib.spec.ts
@@ -2,7 +2,7 @@ import { Tree } from '@nx/devkit';
import storiesGenerator from './stories';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import applicationGenerator from '../application/application';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import libraryGenerator from '../library/library';
import reactNativeComponentGenerator from '../component/component';
diff --git a/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts b/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts
index 98722e9af32ee8..ee57a0ac5effdb 100644
--- a/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts
+++ b/packages/react-native/src/generators/storybook-configuration/configuration.spec.ts
@@ -1,6 +1,6 @@
import { Tree } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { logger } from '@nx/devkit';
import libraryGenerator from '../library/library';
diff --git a/packages/react-native/src/generators/storybook-configuration/schema.d.ts b/packages/react-native/src/generators/storybook-configuration/schema.d.ts
index 74cb2eb7356302..6df0723281297c 100644
--- a/packages/react-native/src/generators/storybook-configuration/schema.d.ts
+++ b/packages/react-native/src/generators/storybook-configuration/schema.d.ts
@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
export interface StorybookConfigureSchema {
name: string;
diff --git a/packages/react-native/src/generators/upgrade-native/schema.d.ts b/packages/react-native/src/generators/upgrade-native/schema.d.ts
index dd8403a234a5e3..a492a56913a7db 100644
--- a/packages/react-native/src/generators/upgrade-native/schema.d.ts
+++ b/packages/react-native/src/generators/upgrade-native/schema.d.ts
@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
export interface UpgradeNativeConfigureSchema {
name: string;
diff --git a/packages/react-native/src/utils/add-linting.spec.ts b/packages/react-native/src/utils/add-linting.spec.ts
index f233d7bf1307ff..03fa628105fa15 100644
--- a/packages/react-native/src/utils/add-linting.spec.ts
+++ b/packages/react-native/src/utils/add-linting.spec.ts
@@ -1,6 +1,6 @@
import { readProjectConfiguration, Tree } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { libraryGenerator } from '@nx/js';
import { addLinting } from './add-linting';
@@ -25,7 +25,7 @@ describe('Add Linting', () => {
const project = readProjectConfiguration(tree, 'my-lib');
expect(project.targets.lint).toBeDefined();
- expect(project.targets.lint.executor).toEqual('@nx/linter:eslint');
+ expect(project.targets.lint.executor).toEqual('@nx/eslint:lint');
});
it('should not add lint target when "none" is passed', async () => {
diff --git a/packages/react-native/src/utils/add-linting.ts b/packages/react-native/src/utils/add-linting.ts
index cc3617e4d5e270..332a7293bee4ee 100644
--- a/packages/react-native/src/utils/add-linting.ts
+++ b/packages/react-native/src/utils/add-linting.ts
@@ -1,4 +1,4 @@
-import { Linter, lintProjectGenerator } from '@nx/linter';
+import { Linter, lintProjectGenerator } from '@nx/eslint';
import {
addDependenciesToPackageJson,
GeneratorCallback,
@@ -10,7 +10,7 @@ import {
addExtendsToLintConfig,
addIgnoresToLintConfig,
isEslintConfigSupported,
-} from '@nx/linter/src/generators/utils/eslint-file';
+} from '@nx/eslint/src/generators/utils/eslint-file';
interface NormalizedSchema {
linter?: Linter;
diff --git a/packages/react-native/src/utils/testing-generators.ts b/packages/react-native/src/utils/testing-generators.ts
index ca6cb58f730b5d..883bfeca750d01 100644
--- a/packages/react-native/src/utils/testing-generators.ts
+++ b/packages/react-native/src/utils/testing-generators.ts
@@ -1,6 +1,6 @@
import { addProjectConfiguration, names, Tree } from '@nx/devkit';
import applicationGenerator from '../generators/application/application';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
export async function createApp(tree: Tree, appName: string): Promise {
await applicationGenerator(tree, {
diff --git a/packages/react/package.json b/packages/react/package.json
index 2bc7c4d2e92251..4fab7cafa2e9d4 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -39,7 +39,7 @@
"tslib": "^2.3.0",
"@nx/devkit": "file:../devkit",
"@nx/js": "file:../js",
- "@nx/linter": "file:../linter",
+ "@nx/eslint": "file:../eslint",
"@nx/web": "file:../web"
},
"publishConfig": {
diff --git a/packages/react/src/generators/application/application.spec.ts b/packages/react/src/generators/application/application.spec.ts
index 2c04b808011aaa..7213abaefd60b7 100644
--- a/packages/react/src/generators/application/application.spec.ts
+++ b/packages/react/src/generators/application/application.spec.ts
@@ -8,7 +8,7 @@ import {
updateNxJson,
} from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { applicationGenerator } from './application';
import { Schema } from './schema';
// need to mock cypress otherwise it'll use the nx installed version from package.json
@@ -463,7 +463,7 @@ describe('app', () => {
const projectsConfigurations = getProjects(appTree);
expect(projectsConfigurations.get('my-app').targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-app/**/*.{ts,tsx,js,jsx}'],
@@ -487,7 +487,7 @@ describe('app', () => {
expect(projectsConfigurations.get('my-app').targets.lint)
.toMatchInlineSnapshot(`
{
- "executor": "@nx/linter:eslint",
+ "executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"my-app/**/*.{ts,tsx,js,jsx}",
@@ -570,7 +570,7 @@ describe('app', () => {
const packageJson = readJson(appTree, '/package.json');
expect(packageJson.devDependencies.eslint).toBeDefined();
- expect(packageJson.devDependencies['@nx/linter']).toBeDefined();
+ expect(packageJson.devDependencies['@nx/eslint']).toBeDefined();
expect(packageJson.devDependencies['@nx/eslint-plugin']).toBeDefined();
expect(packageJson.devDependencies['eslint-plugin-react']).toBeDefined();
expect(
diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts
index de7aa3e5402bb9..6701edfc90b598 100644
--- a/packages/react/src/generators/application/application.ts
+++ b/packages/react/src/generators/application/application.ts
@@ -22,8 +22,8 @@ import {
} from '@nx/devkit';
import reactInitGenerator from '../init/init';
-import { Linter, lintProjectGenerator } from '@nx/linter';
-import { mapLintPattern } from '@nx/linter/src/generators/lint-project/lint-project';
+import { Linter, lintProjectGenerator } from '@nx/eslint';
+import { mapLintPattern } from '@nx/eslint/src/generators/lint-project/lint-project';
import {
babelLoaderVersion,
nxRspackVersion,
@@ -38,7 +38,7 @@ import { addE2e } from './lib/add-e2e';
import {
addExtendsToLintConfig,
isEslintConfigSupported,
-} from '@nx/linter/src/generators/utils/eslint-file';
+} from '@nx/eslint/src/generators/utils/eslint-file';
async function addLinting(host: Tree, options: NormalizedSchema) {
const tasks: GeneratorCallback[] = [];
diff --git a/packages/react/src/generators/application/schema.d.ts b/packages/react/src/generators/application/schema.d.ts
index 7889227778ac55..5b7421d540dc1a 100644
--- a/packages/react/src/generators/application/schema.d.ts
+++ b/packages/react/src/generators/application/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
import type { SupportedStyles } from '../../../typings/style';
export interface Schema {
diff --git a/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts b/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts
index 940b13ef5c67ac..42bb2ac866ebe0 100644
--- a/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts
+++ b/packages/react/src/generators/component-cypress-spec/component-cypress-spec.spec.ts
@@ -1,6 +1,6 @@
import { Tree } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { formatFile } from '../../utils/format-file';
import applicationGenerator from '../application/application';
import libraryGenerator from '../library/library';
@@ -13,14 +13,14 @@ describe('react:component-cypress-spec', () => {
{
plainJS: false,
testCmpSrcWithProps: `import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
export const Test = (props: TestProps) => {
return (
@@ -28,13 +28,13 @@ describe('react:component-cypress-spec', () => {
);
};
-
- export default Test;
+
+ export default Test;
`,
testCmpSrcWithoutProps: `import React from 'react';
-
+
import './test.scss';
-
+
export const Test = () => {
return (
@@ -42,15 +42,15 @@ describe('react:component-cypress-spec', () => {
);
};
-
- export default Test;
+
+ export default Test;
`,
},
{
plainJS: true,
testCmpSrcWithProps: `import React from 'react';
-
- import './test.scss';
+
+ import './test.scss';
export const Test = (props: TestProps) => {
return (
@@ -58,8 +58,8 @@ describe('react:component-cypress-spec', () => {
);
};
-
- export default Test;
+
+ export default Test;
`,
testCmpSrcWithoutProps: `import React from 'react';
import './test.scss';
@@ -70,8 +70,8 @@ describe('react:component-cypress-spec', () => {
);
};
-
- export default Test;
+
+ export default Test;
`,
},
].forEach((testConfig) => {
@@ -106,7 +106,7 @@ describe('react:component-cypress-spec', () => {
)
.toContain(formatFile`describe('test-ui-lib: Test component', () => {
beforeEach(() => cy.visit('/iframe.html?id=test--primary&args=name;displayAge:false;'));
-
+
it('should render the component', () => {
cy.get('h1').should('contain', 'Welcome to Test!');
});
@@ -133,7 +133,7 @@ describe('react:component-cypress-spec', () => {
expect(formatFile`${appTree.read(cypressStorySpecFilePath, 'utf-8')}`)
.toContain(formatFile`describe('test-ui-lib: Test component', () => {
beforeEach(() => cy.visit('/iframe.html?id=test--primary'));
-
+
it('should render the component', () => {
cy.get('h1').should('contain', 'Welcome to Test!');
});
diff --git a/packages/react/src/generators/component-story/component-story.spec.ts b/packages/react/src/generators/component-story/component-story.spec.ts
index 0b7b3f73a107e4..e3e8a83e66233b 100644
--- a/packages/react/src/generators/component-story/component-story.spec.ts
+++ b/packages/react/src/generators/component-story/component-story.spec.ts
@@ -2,7 +2,7 @@ import { getProjects, Tree, updateProjectConfiguration } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import libraryGenerator from '../library/library';
import componentStoryGenerator from './component-story';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
describe('react:component-story', () => {
let appTree: Tree;
@@ -62,9 +62,9 @@ describe('react:component-story', () => {
appTree.write(
'test-ui-lib/src/lib/test-ui-libplain.jsx',
`import React from 'react';
-
+
import './test.scss';
-
+
export const Test = () => {
return (
@@ -72,8 +72,8 @@ describe('react:component-story', () => {
);
};
-
- export default Test;
+
+ export default Test;
`
);
@@ -97,9 +97,9 @@ describe('react:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
import './test.scss';
-
+
export const Test = () => {
return (
@@ -107,8 +107,8 @@ describe('react:component-story', () => {
);
};
-
- export default Test;
+
+ export default Test;
`
);
@@ -128,14 +128,14 @@ describe('react:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
export const Test = (props: TestProps) => {
return (
@@ -143,8 +143,8 @@ describe('react:component-story', () => {
);
};
-
- export default Test;
+
+ export default Test;
`
);
@@ -164,18 +164,18 @@ describe('react:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
import './test.scss';
export type ButtonStyle = 'default' | 'primary' | 'warning';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
someAction: (e: unknown) => void;
style: ButtonStyle;
}
-
+
export const Test = (props: TestProps) => {
return (
@@ -184,8 +184,8 @@ describe('react:component-story', () => {
);
};
-
- export default Test;
+
+ export default Test;
`
);
@@ -320,14 +320,14 @@ describe('react:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
${src}
`
);
@@ -435,14 +435,14 @@ describe('react:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
${src}
`
);
@@ -463,19 +463,19 @@ describe('react:component-story', () => {
appTree.write(
cmpPath,
`import React from 'react';
-
+
function One() {
return Hello one
;
}
-
+
function Two() {
return Hello two
;
}
-
+
export interface ThreeProps {
name: string;
- }
-
+ }
+
function Three(props: ThreeProps) {
return (
@@ -483,8 +483,8 @@ describe('react:component-story', () => {
);
}
-
- export { One, Two, Three };
+
+ export { One, Two, Three };
`
);
diff --git a/packages/react/src/generators/component-test/component-test.spec.ts b/packages/react/src/generators/component-test/component-test.spec.ts
index 174faf4edda6bc..4b5fa164ec71cf 100644
--- a/packages/react/src/generators/component-test/component-test.spec.ts
+++ b/packages/react/src/generators/component-test/component-test.spec.ts
@@ -1,7 +1,7 @@
import { assertMinimumCypressVersion } from '@nx/cypress/src/utils/cypress-version';
import { Tree } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import libraryGenerator from '../library/library';
import { componentTestGenerator } from './component-test';
diff --git a/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts b/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
index f721f7e910c52d..ecd17bd11ff14d 100644
--- a/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
+++ b/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
@@ -7,7 +7,7 @@ import {
updateProjectConfiguration,
} 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 { libraryGenerator } from '../library/library';
diff --git a/packages/react/src/generators/federate-module/federate-module.spec.ts b/packages/react/src/generators/federate-module/federate-module.spec.ts
index 1ebce3f3681031..12ce7b19b87472 100644
--- a/packages/react/src/generators/federate-module/federate-module.spec.ts
+++ b/packages/react/src/generators/federate-module/federate-module.spec.ts
@@ -3,7 +3,7 @@ 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 { remoteGeneratorInternal } from '../remote/remote';
describe('federate-module', () => {
diff --git a/packages/react/src/generators/host/host.spec.ts b/packages/react/src/generators/host/host.spec.ts
index e1298de59e7037..30172d8e975b95 100644
--- a/packages/react/src/generators/host/host.spec.ts
+++ b/packages/react/src/generators/host/host.spec.ts
@@ -2,7 +2,7 @@ import type { Tree } from '@nx/devkit';
import { readJson } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import hostGenerator from './host';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
describe('hostGenerator', () => {
let tree: Tree;
diff --git a/packages/react/src/generators/host/schema.d.ts b/packages/react/src/generators/host/schema.d.ts
index 51dc14d63b6881..6b399c2b076822 100644
--- a/packages/react/src/generators/host/schema.d.ts
+++ b/packages/react/src/generators/host/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
import type { SupportedStyles } from '../../../typings';
export interface Schema {
diff --git a/packages/react/src/generators/library/lib/add-linting.ts b/packages/react/src/generators/library/lib/add-linting.ts
index 0834a21f8665ba..610f83660a2a95 100644
--- a/packages/react/src/generators/library/lib/add-linting.ts
+++ b/packages/react/src/generators/library/lib/add-linting.ts
@@ -1,5 +1,5 @@
import { Tree } from 'nx/src/generators/tree';
-import { Linter, lintProjectGenerator } from '@nx/linter';
+import { Linter, lintProjectGenerator } from '@nx/eslint';
import { joinPathFragments } from 'nx/src/utils/path';
import { addDependenciesToPackageJson, runTasksInSerial } from '@nx/devkit';
@@ -8,7 +8,7 @@ import { extraEslintDependencies } from '../../../utils/lint';
import {
addExtendsToLintConfig,
isEslintConfigSupported,
-} from '@nx/linter/src/generators/utils/eslint-file';
+} from '@nx/eslint/src/generators/utils/eslint-file';
export async function addLinting(host: Tree, options: NormalizedSchema) {
if (options.linter === Linter.EsLint) {
diff --git a/packages/react/src/generators/library/lib/normalize-options.spec.ts b/packages/react/src/generators/library/lib/normalize-options.spec.ts
index fda0e2648fb758..0e1bafc067fbda 100644
--- a/packages/react/src/generators/library/lib/normalize-options.spec.ts
+++ b/packages/react/src/generators/library/lib/normalize-options.spec.ts
@@ -1,5 +1,5 @@
import type { Tree } from '@nx/devkit';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import { normalizeOptions } from './normalize-options';
diff --git a/packages/react/src/generators/library/library.spec.ts b/packages/react/src/generators/library/library.spec.ts
index 2420d6b64e499a..93583cd3de7479 100644
--- a/packages/react/src/generators/library/library.spec.ts
+++ b/packages/react/src/generators/library/library.spec.ts
@@ -7,7 +7,7 @@ import {
updateJson,
} from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { nxVersion } from '../../utils/versions';
import applicationGenerator from '../application/application';
import libraryGenerator from './library';
@@ -53,7 +53,7 @@ describe('lib', () => {
expect(project.root).toEqual('my-lib');
expect(project.targets.build).toBeUndefined();
expect(project.targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx}'],
@@ -316,7 +316,7 @@ describe('lib', () => {
expect(config.root).toEqual('my-dir/my-lib');
expect(config.targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-dir/my-lib/**/*.{ts,tsx,js,jsx}'],
@@ -418,7 +418,7 @@ describe('lib', () => {
expect(config.targets.test).toBeUndefined();
expect(config.targets.lint).toMatchInlineSnapshot(`
{
- "executor": "@nx/linter:eslint",
+ "executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"my-lib/**/*.{ts,tsx,js,jsx}",
diff --git a/packages/react/src/generators/library/schema.d.ts b/packages/react/src/generators/library/schema.d.ts
index 21621995c024cc..8de7282dcde538 100644
--- a/packages/react/src/generators/library/schema.d.ts
+++ b/packages/react/src/generators/library/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
import type { SupportedStyles } from '../../../typings/style';
export interface Schema {
diff --git a/packages/react/src/generators/redux/redux.spec.ts b/packages/react/src/generators/redux/redux.spec.ts
index f278fbc0d19b95..89bf93826d6978 100644
--- a/packages/react/src/generators/redux/redux.spec.ts
+++ b/packages/react/src/generators/redux/redux.spec.ts
@@ -1,6 +1,6 @@
import { readJson, 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 { libraryGenerator } from '../library/library';
import { reduxGenerator } from './redux';
diff --git a/packages/react/src/generators/remote/remote.spec.ts b/packages/react/src/generators/remote/remote.spec.ts
index b4f5755f36b2d9..1d1e250d2fa798 100644
--- a/packages/react/src/generators/remote/remote.spec.ts
+++ b/packages/react/src/generators/remote/remote.spec.ts
@@ -1,6 +1,6 @@
import { readJson, readNxJson } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import remote from './remote';
import { getRootTsConfigPath, getRootTsConfigPathInTree } from '@nx/js';
diff --git a/packages/react/src/generators/remote/schema.d.ts b/packages/react/src/generators/remote/schema.d.ts
index cbcb6a96f17c16..cb57362406bab4 100644
--- a/packages/react/src/generators/remote/schema.d.ts
+++ b/packages/react/src/generators/remote/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
import type { SupportedStyles } from '../../../typings';
import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
diff --git a/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts b/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts
index 9da982b444af31..21d89d43fcd034 100644
--- a/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts
+++ b/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts
@@ -2,7 +2,7 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import { readJson, Tree } from '@nx/devkit';
import applicationGenerator from '../application/application';
import setupSsrGenerator from './setup-ssr';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
describe('setupSsrGenerator', () => {
let tree: Tree;
diff --git a/packages/react/src/generators/stories/stories.app.spec.ts b/packages/react/src/generators/stories/stories.app.spec.ts
index 31302908f4c7ae..eff11ed002c5bd 100644
--- a/packages/react/src/generators/stories/stories.app.spec.ts
+++ b/packages/react/src/generators/stories/stories.app.spec.ts
@@ -1,7 +1,7 @@
import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
import { 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 storiesGenerator from './stories';
// need to mock cypress otherwise it'll use the nx installed version from package.json
@@ -112,14 +112,14 @@ describe('react:stories for applications', () => {
appTree.write(
'test-ui-app/src/app/test-path/ignore-it/another-one.tsx',
`import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
export const Test = (props: TestProps) => {
return (
@@ -127,7 +127,7 @@ describe('react:stories for applications', () => {
);
};
-
+
export default Test;
`
);
@@ -135,14 +135,14 @@ describe('react:stories for applications', () => {
appTree.write(
'test-ui-app/src/app/anothercmp/another-cmp-test.skip.tsx',
`import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
export const Test = (props: TestProps) => {
return (
@@ -150,7 +150,7 @@ describe('react:stories for applications', () => {
);
};
-
+
export default Test;
`
);
@@ -268,14 +268,14 @@ describe('react:stories for applications', () => {
appTree.write(
'test-ui-app/src/app/anothercmp/comp-a/comp-a.tsx',
`import React from 'react';
-
+
import './test.scss';
-
+
export interface TestProps {
name: string;
displayAge: boolean;
}
-
+
export const Test = (props: TestProps) => {
return (
@@ -283,7 +283,7 @@ describe('react:stories for applications', () => {
);
};
-
+
export default Test;
`
);
diff --git a/packages/react/src/generators/stories/stories.lib.spec.ts b/packages/react/src/generators/stories/stories.lib.spec.ts
index 958124e9ad0865..ad89c17b7d9628 100644
--- a/packages/react/src/generators/stories/stories.lib.spec.ts
+++ b/packages/react/src/generators/stories/stories.lib.spec.ts
@@ -2,7 +2,7 @@ import { Tree } from '@nx/devkit';
import storiesGenerator from './stories';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import applicationGenerator from '../application/application';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import libraryGenerator from '../library/library';
describe('react:stories for libraries', () => {
@@ -92,12 +92,12 @@ describe('react:stories for libraries', () => {
appTree.write(
'test-ui-lib/src/lib/test-path/ignore-it/another-one.tsx',
`import React from 'react';
-
+
export interface IgnoreProps {
name: string;
displayAge: boolean;
}
-
+
export const Ignored = (props: IgnoreProps) => {
return (
@@ -105,7 +105,7 @@ describe('react:stories for libraries', () => {
);
};
-
+
export default Ignored;
`
);
@@ -113,12 +113,12 @@ describe('react:stories for libraries', () => {
appTree.write(
'test-ui-lib/src/lib/anothercmp/another-cmp.skip.tsx',
`import React from 'react';
-
+
export interface OtherTestProps {
name: string;
displayAge: boolean;
}
-
+
export const OtherTest = (props: OtherTestProps) => {
return (
@@ -126,7 +126,7 @@ describe('react:stories for libraries', () => {
);
};
-
+
export default OtherTest;
`
);
diff --git a/packages/react/src/generators/stories/stories.nextjs.spec.ts b/packages/react/src/generators/stories/stories.nextjs.spec.ts
index 1b02328f0e0100..8b7ba5908d34e9 100644
--- a/packages/react/src/generators/stories/stories.nextjs.spec.ts
+++ b/packages/react/src/generators/stories/stories.nextjs.spec.ts
@@ -6,7 +6,7 @@ import {
import storiesGenerator from './stories';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import applicationGenerator from '../application/application';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
describe('nextjs:stories for applications', () => {
let tree: Tree;
diff --git a/packages/react/src/generators/storybook-configuration/configuration.spec.ts b/packages/react/src/generators/storybook-configuration/configuration.spec.ts
index 595bcd6b8c1056..7fed7a85c48942 100644
--- a/packages/react/src/generators/storybook-configuration/configuration.spec.ts
+++ b/packages/react/src/generators/storybook-configuration/configuration.spec.ts
@@ -2,7 +2,7 @@
import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
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 libraryGenerator from '../library/library';
diff --git a/packages/react/src/generators/storybook-configuration/schema.d.ts b/packages/react/src/generators/storybook-configuration/schema.d.ts
index 8d28fc92939889..ddfd30192f2171 100644
--- a/packages/react/src/generators/storybook-configuration/schema.d.ts
+++ b/packages/react/src/generators/storybook-configuration/schema.d.ts
@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
export interface StorybookConfigureSchema {
name: string;
diff --git a/packages/react/src/utils/testing-generators.ts b/packages/react/src/utils/testing-generators.ts
index fa459b927a1c6f..e495057985a638 100644
--- a/packages/react/src/utils/testing-generators.ts
+++ b/packages/react/src/utils/testing-generators.ts
@@ -1,6 +1,6 @@
import { addProjectConfiguration, names, Tree } from '@nx/devkit';
import applicationGenerator from '../generators/application/application';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
export async function createApp(tree: Tree, appName: string): Promise {
await applicationGenerator(tree, {
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 7828c521f8c09f..c5904139d95207 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -36,7 +36,7 @@
"@nx/cypress": "file:../cypress",
"@nx/devkit": "file:../devkit",
"@nx/js": "file:../js",
- "@nx/linter": "file:../linter",
+ "@nx/eslint": "file:../eslint",
"@nx/workspace": "file:../workspace"
},
"publishConfig": {
diff --git a/packages/storybook/src/generators/configuration/configuration.spec.ts b/packages/storybook/src/generators/configuration/configuration.spec.ts
index 29f3adad089ed5..ad4d72d9f15f84 100644
--- a/packages/storybook/src/generators/configuration/configuration.spec.ts
+++ b/packages/storybook/src/generators/configuration/configuration.spec.ts
@@ -11,7 +11,7 @@ import {
} from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { libraryGenerator } from '@nx/js';
import { TsConfig } from '../../utils/utilities';
import { storybookVersion } from '../../utils/versions';
diff --git a/packages/storybook/src/generators/configuration/configuration.ts b/packages/storybook/src/generators/configuration/configuration.ts
index 85d81e3d79c1ef..1bf5160a049694 100644
--- a/packages/storybook/src/generators/configuration/configuration.ts
+++ b/packages/storybook/src/generators/configuration/configuration.ts
@@ -29,7 +29,7 @@ import {
projectIsRootProjectInStandaloneWorkspace,
updateLintConfig,
} from './lib/util-functions';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import {
findStorybookAndBuildTargetsAndCompiler,
pleaseUpgrade,
@@ -70,14 +70,14 @@ export async function configurationGenerator(
if (viteBuildTarget) {
if (schema.uiFramework === '@storybook/react-webpack5') {
logger.info(
- `Your project ${schema.name} uses Vite as a bundler.
+ `Your project ${schema.name} uses Vite as a bundler.
Nx will configure Storybook for this project to use Vite as well.`
);
schema.uiFramework = '@storybook/react-vite';
}
if (schema.uiFramework === '@storybook/web-components-webpack5') {
logger.info(
- `Your project ${schema.name} uses Vite as a bundler.
+ `Your project ${schema.name} uses Vite as a bundler.
Nx will configure Storybook for this project to use Vite as well.`
);
schema.uiFramework = '@storybook/web-components-vite';
diff --git a/packages/storybook/src/generators/configuration/lib/util-functions.ts b/packages/storybook/src/generators/configuration/lib/util-functions.ts
index f4f2654e09ae81..2188f5b5d13a14 100644
--- a/packages/storybook/src/generators/configuration/lib/util-functions.ts
+++ b/packages/storybook/src/generators/configuration/lib/util-functions.ts
@@ -18,7 +18,7 @@ import {
writeJson,
} from '@nx/devkit';
import { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { join, relative } from 'path';
import {
dedupe,
@@ -28,8 +28,8 @@ import {
import { StorybookConfigureSchema } from '../schema';
import { UiFramework7 } from '../../../utils/models';
import { nxVersion } from '../../../utils/versions';
-import { findEslintFile } from '@nx/linter/src/generators/utils/eslint-file';
-import { useFlatConfig } from '@nx/linter/src/utils/flat-config';
+import { findEslintFile } from '@nx/eslint/src/generators/utils/eslint-file';
+import { useFlatConfig } from '@nx/eslint/src/utils/flat-config';
const DEFAULT_PORT = 4400;
diff --git a/packages/storybook/src/generators/configuration/schema.d.ts b/packages/storybook/src/generators/configuration/schema.d.ts
index 715148a762e190..c349cac10b53e8 100644
--- a/packages/storybook/src/generators/configuration/schema.d.ts
+++ b/packages/storybook/src/generators/configuration/schema.d.ts
@@ -1,4 +1,4 @@
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { UiFramework7, UiFramework } from '../../utils/models';
export interface StorybookConfigureSchema {
diff --git a/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts b/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts
index 0dc2fb7533af89..3365702123f05e 100644
--- a/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts
+++ b/packages/storybook/src/generators/cypress-project/cypress-project.spec.ts
@@ -1,7 +1,7 @@
import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
import { readJson, readProjectConfiguration, Tree } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { libraryGenerator } from '@nx/js';
import { cypressProjectGenerator } from './cypress-project';
diff --git a/packages/storybook/src/generators/cypress-project/cypress-project.ts b/packages/storybook/src/generators/cypress-project/cypress-project.ts
index 40b2bacc57d9eb..c5678e09f30055 100644
--- a/packages/storybook/src/generators/cypress-project/cypress-project.ts
+++ b/packages/storybook/src/generators/cypress-project/cypress-project.ts
@@ -19,7 +19,7 @@ import {
updateJson,
updateProjectConfiguration,
} from '@nx/devkit';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { join } from 'path';
import { safeFileDelete } from '../../utils/utilities';
diff --git a/packages/storybook/src/utils/testing.ts b/packages/storybook/src/utils/testing.ts
index c89f80f34e16e6..c09e372f988641 100644
--- a/packages/storybook/src/utils/testing.ts
+++ b/packages/storybook/src/utils/testing.ts
@@ -1,7 +1,7 @@
import { Tree } from '@nx/devkit';
import { libraryGenerator } from '@nx/js';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
export async function createTestUILibNoNgDevkit(
appTree: Tree,
diff --git a/packages/vue/package.json b/packages/vue/package.json
index c76961e9f0f9ed..76bd27f6d9f77c 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -33,7 +33,7 @@
"@nx/devkit": "file:../devkit",
"@nx/jest": "file:../jest",
"@nx/js": "file:../js",
- "@nx/linter": "file:../linter",
+ "@nx/eslint": "file:../eslint",
"@nx/vite": "file:../vite",
"@nx/web": "file:../web",
"@phenomnomnominal/tsquery": "~5.0.1"
diff --git a/packages/vue/src/generators/application/application.ts b/packages/vue/src/generators/application/application.ts
index bc45d0367c705d..35134638b647b1 100644
--- a/packages/vue/src/generators/application/application.ts
+++ b/packages/vue/src/generators/application/application.ts
@@ -6,7 +6,7 @@ import {
toJS,
Tree,
} from '@nx/devkit';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { Schema } from './schema';
import { normalizeOptions } from './lib/normalize-options';
import { vueInitGenerator } from '../init/init';
diff --git a/packages/vue/src/generators/application/schema.d.ts b/packages/vue/src/generators/application/schema.d.ts
index 3ce0654f7236a5..7df31a02a396dd 100644
--- a/packages/vue/src/generators/application/schema.d.ts
+++ b/packages/vue/src/generators/application/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
export interface Schema {
name: string;
diff --git a/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
index f5b244e52dca41..70f3d30e030643 100644
--- a/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
+++ b/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -39,7 +39,7 @@ exports[`lib should add correct jest.config.ts and dependencies to package.json
"@nx/eslint-plugin": "0.0.1",
"@nx/jest": "0.0.1",
"@nx/js": "0.0.1",
- "@nx/linter": "0.0.1",
+ "@nx/eslint": "0.0.1",
"@nx/rollup": "0.0.1",
"@nx/vite": "0.0.1",
"@nx/vue": "0.0.1",
@@ -234,7 +234,7 @@ exports[`lib should add vue, vite and vitest to package.json 1`] = `
"@nx/cypress": "0.0.1",
"@nx/eslint-plugin": "0.0.1",
"@nx/js": "0.0.1",
- "@nx/linter": "0.0.1",
+ "@nx/eslint": "0.0.1",
"@nx/rollup": "0.0.1",
"@nx/vite": "0.0.1",
"@nx/vue": "0.0.1",
diff --git a/packages/vue/src/generators/library/lib/normalize-options.spec.ts b/packages/vue/src/generators/library/lib/normalize-options.spec.ts
index c126e30d8db320..6378029e200990 100644
--- a/packages/vue/src/generators/library/lib/normalize-options.spec.ts
+++ b/packages/vue/src/generators/library/lib/normalize-options.spec.ts
@@ -1,5 +1,5 @@
import type { Tree } from '@nx/devkit';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import { normalizeOptions } from './normalize-options';
diff --git a/packages/vue/src/generators/library/library.spec.ts b/packages/vue/src/generators/library/library.spec.ts
index 9d5d6bde90dfe4..2713f20d5e7a89 100644
--- a/packages/vue/src/generators/library/library.spec.ts
+++ b/packages/vue/src/generators/library/library.spec.ts
@@ -6,7 +6,7 @@ import {
updateJson,
} from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import { nxVersion } from '../../utils/versions';
import libraryGenerator from './library';
import { Schema } from './schema';
@@ -42,7 +42,7 @@ describe('lib', () => {
expect(project.root).toEqual('my-lib');
expect(project.targets.build).toBeUndefined();
expect(project.targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-lib/**/*.{ts,tsx,js,jsx,vue}'],
@@ -214,7 +214,7 @@ describe('lib', () => {
expect(config.root).toEqual('my-dir/my-lib');
expect(config.targets.lint).toEqual({
- executor: '@nx/linter:eslint',
+ executor: '@nx/eslint:lint',
outputs: ['{options.outputFile}'],
options: {
lintFilePatterns: ['my-dir/my-lib/**/*.{ts,tsx,js,jsx,vue}'],
@@ -261,7 +261,7 @@ describe('lib', () => {
expect(config.targets.test).toBeUndefined();
expect(config.targets.lint).toMatchInlineSnapshot(`
{
- "executor": "@nx/linter:eslint",
+ "executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"my-lib/**/*.{ts,tsx,js,jsx,vue}",
diff --git a/packages/vue/src/generators/library/schema.d.ts b/packages/vue/src/generators/library/schema.d.ts
index 6b08f31cb153a0..dca9062124bc1e 100644
--- a/packages/vue/src/generators/library/schema.d.ts
+++ b/packages/vue/src/generators/library/schema.d.ts
@@ -1,5 +1,5 @@
import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import type { Linter } from '@nx/linter';
+import type { Linter } from '@nx/eslint';
import type { SupportedStyles } from '../../../typings/style';
export interface Schema {
diff --git a/packages/vue/src/generators/stories/lib/component-story.spec.ts b/packages/vue/src/generators/stories/lib/component-story.spec.ts
index e000fbaef974ab..6e68c1cb07e9d0 100644
--- a/packages/vue/src/generators/stories/lib/component-story.spec.ts
+++ b/packages/vue/src/generators/stories/lib/component-story.spec.ts
@@ -2,7 +2,7 @@ import { getProjects, Tree, updateProjectConfiguration } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import libraryGenerator from '../../library/library';
import { createComponentStories } from './component-story';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
describe('vue:component-story', () => {
let appTree: Tree;
@@ -42,11 +42,11 @@ describe('vue:component-story', () => {
age: number;
}>();
-
+
Welcome to Vlv!
-
+
`
@@ -81,11 +81,11 @@ describe('vue:component-story', () => {
}
}
-
+
Welcome to Vlv!
-
+
`
diff --git a/packages/vue/src/generators/stories/stories.app.spec.ts b/packages/vue/src/generators/stories/stories.app.spec.ts
index b9a327d573f47f..dded11aaa60fd3 100644
--- a/packages/vue/src/generators/stories/stories.app.spec.ts
+++ b/packages/vue/src/generators/stories/stories.app.spec.ts
@@ -1,6 +1,6 @@
import { 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 storiesGenerator from './stories';
diff --git a/packages/vue/src/generators/stories/stories.lib.spec.ts b/packages/vue/src/generators/stories/stories.lib.spec.ts
index d0b48c27fbdaf7..55cf9a5ac02f98 100644
--- a/packages/vue/src/generators/stories/stories.lib.spec.ts
+++ b/packages/vue/src/generators/stories/stories.lib.spec.ts
@@ -1,7 +1,7 @@
import { Tree } from '@nx/devkit';
import storiesGenerator from './stories';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/linter';
+import { Linter } from '@nx/eslint';
import libraryGenerator from '../library/library';
const componentContent = `