feat(core): move @nrwl/linter to inside the func

nrwl · Feb 16, 2023 · f9504bf · f9504bf
1 parent f3212af
commit f9504bf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/packages/angular/src/generators/application/angular-v14/lib/add-unit-test-runner.ts b/packages/angular/src/generators/application/angular-v14/lib/add-unit-test-runner.ts
@@ -17,9 +17,6 @@ export async function addUnitTestRunner(host: Tree, options: NormalizedSchema) {
       rootProject: options.rootProject,
     });
   } else if (options.unitTestRunner === UnitTestRunner.Karma) {
-    const {
-      karmaProjectGenerator,
-    } = require('../../../karma-project/karma-project');
     await karmaProjectGenerator(host, {
       project: options.name,
       skipFormat: true,

diff --git a/packages/angular/src/generators/init/init.ts b/packages/angular/src/generators/init/init.ts
@@ -81,7 +81,7 @@ export async function angularInitGenerator(
   }
   const unitTestTask = await addUnitTestRunner(tree, options);
   tasks.push(unitTestTask);
-  const e2eTask = await addE2ETestRunner(tree, options);
+  const e2eTask = addE2ETestRunner(tree, options);
   tasks.push(e2eTask);
 
   addGitIgnoreEntry(tree, '.angular');
@@ -188,10 +188,7 @@ async function addUnitTestRunner(
   }
 }
 
-async function addE2ETestRunner(
-  tree: Tree,
-  options: Schema
-): Promise<GeneratorCallback> {
+function addE2ETestRunner(tree: Tree, options: Schema): GeneratorCallback {
   switch (options.e2eTestRunner) {
     case E2eTestRunner.Protractor:
       return !options.skipPackageJson

diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
@@ -19,8 +19,6 @@ import {
   writeJson,
 } from '@nrwl/devkit';
 import { getImportPath } from 'nx/src/utils/path';
-// nx-ignore-next-line
-const { Linter } = require('@nrwl/linter'); // use require to import to avoid circular dependency
 import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
 import {
   getRelativePathToRootTsConfig,
@@ -380,6 +378,7 @@ function normalizeOptions(
     options.buildable = true;
   }
 
+  const { Linter } = require('@nrwl/linter');
   if (options.config === 'npm-scripts') {
     options.unitTestRunner = 'none';
     options.linter = Linter.None;

diff --git a/packages/workspace/src/generators/library/library.ts b/packages/workspace/src/generators/library/library.ts
@@ -238,7 +238,8 @@ function normalizeOptions(tree: Tree, options: Schema): NormalizedSchema {
   }
 
   if (!options.linter) {
-    options.linter = 'eslint';
+    const { Linter } = require('@nrwl/linter');
+    options.linter = Linter.EsLint;
   }
 
   const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');