@@ -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 32cfa2a57a..77eb8883ce 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 b4ae7b807f..e515465f19 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 52a4ae7487..6b971efac5 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 8c16586ab6..d9337b4069 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 98722e9af3..ee57a0ac5e 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 74cb2eb735..6df0723281 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 dd8403a234..a492a56913 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 f233d7bf13..03fa628105 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 cc3617e4d5..332a7293be 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 ca6cb58f73..883bfeca75 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
@@ -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 0b7b3f73a1..e3e8a83e66 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 174faf4edd..4b5fa164ec 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 f721f7e910..ecd17bd11f 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 1ebce3f368..12ce7b19b8 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 9c6aa8bb70..5ef088edc1 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 51dc14d63b..6b399c2b07 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 0834a21f86..610f83660a 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 fda0e2648f..0e1bafc067 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 6837396688..3f6235bb9e 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}'],
@@ -414,7 +414,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 21621995c0..8de7282dcd 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 f278fbc0d1..89bf93826d 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 b4f5755f36..1d1e250d2f 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 cbcb6a96f1..cb57362406 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 9da982b444..21d89d43fc 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 31302908f4..eff11ed002 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 958124e9ad..ad89c17b7d 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 1b02328f0e..8b7ba5908d 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 9b6b0a7509..ea4a1df2bf 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 8d28fc9293..ddfd30192f 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/lint.ts b/packages/react/src/utils/lint.ts
index 05e8641d6f..c4ba31bcc2 100644
--- a/packages/react/src/utils/lint.ts
+++ b/packages/react/src/utils/lint.ts
@@ -17,7 +17,7 @@ export const extraEslintDependencies = {
};
/**
- * @deprecated Use `addExtendsToLintConfig` from `@nx/linter` instead.
+ * @deprecated Use `addExtendsToLintConfig` from `@nx/eslint` instead.
*/
export const extendReactEslintJson = (json: Linter.Config) => {
const { extends: pluginExtends, ...config } = json;
diff --git a/packages/react/src/utils/testing-generators.ts b/packages/react/src/utils/testing-generators.ts
index fa459b927a..e495057985 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): PromiseWelcome 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 b9a327d573..dded11aaa6 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 d0b48c27fb..55cf9a5ac0 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 = `