refactor(nxext): move mapLintPattern to core

nxext · Sep 22, 2023 · 1afd04d · 1afd04d
1 parent 8a8f0d9
commit 1afd04d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nxext/core",
-  "version": "16.7.0",
+  "version": "16.8.0",
   "description": "Core utilities for nxext Nx plugins",
   "author": {
     "name": "Gion Kunz",

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,2 +1,3 @@
 export * from './lib/utils/add-plugin-to-nx-json';
 export * from './lib/utils/ast-utils';
+export * from './lib/utils/map-lint-pattern';
diff --git a/packages/core/src/lib/utils/map-lint-pattern.ts b/packages/core/src/lib/utils/map-lint-pattern.ts
@@ -0,0 +1,8 @@
+export function mapLintPattern(
+  projectRoot: string,
+  extension: string,
+  rootProject?: boolean
+) {
+  const infix = rootProject ? 'src/' : '';
+  return `${projectRoot}/${infix}**/*.${extension}`;
+}
diff --git a/packages/nuxt/src/generators/application/lib/add-linting.ts b/packages/nuxt/src/generators/application/lib/add-linting.ts
@@ -13,6 +13,7 @@ import {
   ensurePackage,
   NX_VERSION,
 } from '@nx/devkit';
+import { mapLintPattern } from '@nxext/core';
 
 export async function addLinting(host: Tree, options: NormalizedSchema) {
   const tasks: GeneratorCallback[] = [];
@@ -55,12 +56,3 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
   }
   return runTasksInSerial(...tasks);
 }
-
-function mapLintPattern(
-  projectRoot: string,
-  extension: string,
-  rootProject?: boolean
-) {
-  const infix = rootProject ? 'src/' : '';
-  return `${projectRoot}/${infix}**/*.${extension}`;
-}
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -27,6 +27,7 @@
   "typings": "./src/index.d.ts",
   "schematics": "./generators.json",
   "peerDependencies": {
+    "@nxext/core": "^16.8.0",
     "@nx/jest": "^16.8.0",
     "@nx/vite": "^16.8.0",
     "@nx/js": "^16.8.0",

diff --git a/packages/svelte/src/generators/application/lib/add-linting.ts b/packages/svelte/src/generators/application/lib/add-linting.ts
@@ -26,7 +26,7 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
   );
   host.delete(joinPathFragments(options.projectRoot, '.eslintrc.json'));
 
-  const installTask = await addDependenciesToPackageJson(
+  const installTask = addDependenciesToPackageJson(
     host,
     extraEslintDependencies.dependencies,
     extraEslintDependencies.devDependencies

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -29,7 +29,7 @@
     "typescript": "5.1.6",
     "@nx/workspace": "^16.8.0",
     "nx": "^16.8.0",
-    "@nxext/core": "^16.7.0"
+    "@nxext/core": "^16.8.0"
   },
   "peerDependencies": {
     "@nx/js": "^16.8.0",

diff --git a/packages/vue/src/generators/application/lib/add-linting.ts b/packages/vue/src/generators/application/lib/add-linting.ts
@@ -10,6 +10,7 @@ import {
   ensurePackage,
   NX_VERSION,
 } from '@nx/devkit';
+import { mapLintPattern } from '@nxext/core';
 
 export async function addLinting(host: Tree, options: NormalizedSchema) {
   const tasks: GeneratorCallback[] = [];
@@ -52,12 +53,3 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
   }
   return runTasksInSerial(...tasks);
 }
-
-function mapLintPattern(
-  projectRoot: string,
-  extension: string,
-  rootProject?: boolean
-) {
-  const infix = rootProject ? 'src/' : '';
-  return `${projectRoot}/${infix}**/*.${extension}`;
-}