@nx/plugin 17.2.0-beta.5 → 17.2.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "17.2.0-beta.5",
+  "version": "17.2.0-beta.8",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -31,11 +31,11 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.2.0-beta.5",
-    "@nx/jest": "17.2.0-beta.5",
-    "@nx/js": "17.2.0-beta.5",
-    "@nx/eslint": "17.2.0-beta.5",
-    "@nrwl/nx-plugin": "17.2.0-beta.5"
+    "@nx/devkit": "17.2.0-beta.8",
+    "@nx/jest": "17.2.0-beta.8",
+    "@nx/js": "17.2.0-beta.8",
+    "@nx/eslint": "17.2.0-beta.8",
+    "@nrwl/nx-plugin": "17.2.0-beta.8"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/e2e-project/e2e.js

@@ -102,7 +102,6 @@ async function addLintingToApplication(tree, options) {
         tsConfigPaths: [
             (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.app.json'),
         ],
-        eslintFilePatterns: [`${options.projectRoot}/**/*.ts`],
         unitTestRunner: 'jest',
         skipFormat: true,
         setParserOptionsProject: false,

package/src/generators/lint-checks/generator.js

@@ -44,22 +44,25 @@ function addMigrationJsonChecks(host, options, packageJson) {
         return;
     }
     const migrationsJsonPath = (0, devkit_1.joinPathFragments)(projectConfiguration.root, relativeMigrationsJsonPath);
-    if (eslintTarget &&
-        !eslintTargetConfiguration.options?.lintFilePatterns?.includes(migrationsJsonPath)) {
-        // Add to lintFilePatterns
+    if (!eslintTarget) {
+        return;
+    }
+    // Add path to lintFilePatterns if different than default "{projectRoot}"
+    if (eslintTargetConfiguration.options?.lintFilePatterns &&
+        !eslintTargetConfiguration.options.lintFilePatterns.includes(migrationsJsonPath)) {
         eslintTargetConfiguration.options.lintFilePatterns.push(migrationsJsonPath);
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
-        // Update project level eslintrc
-        (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
-            Object.keys(o.rules ?? {})?.includes('@nrwl/nx/nx-plugin-checks'), (o) => {
-            const fileSet = new Set(Array.isArray(o.files) ? o.files : [o.files]);
-            fileSet.add(relativeMigrationsJsonPath);
-            return {
-                ...o,
-                files: Array.from(fileSet),
-            };
-        });
     }
+    // Update project level eslintrc
+    (0, eslint_file_1.updateOverrideInLintConfig)(host, projectConfiguration.root, (o) => Object.keys(o.rules ?? {})?.includes('@nx/nx-plugin-checks') ||
+        Object.keys(o.rules ?? {})?.includes('@nrwl/nx/nx-plugin-checks'), (o) => {
+        const fileSet = new Set(Array.isArray(o.files) ? o.files : [o.files]);
+        fileSet.add(relativeMigrationsJsonPath);
+        return {
+            ...o,
+            files: Array.from(fileSet),
+        };
+    });
 }
 exports.addMigrationJsonChecks = addMigrationJsonChecks;
 function updateProjectTarget(host, options, packageJson) {
@@ -68,9 +71,9 @@ function updateProjectTarget(host, options, packageJson) {
         return;
     }
     for (const [target, configuration] of Object.entries(project.targets)) {
-        if (configuration.executor === '@nx/eslint:lint' ||
-            configuration.executor === '@nx/linter:eslint' ||
-            configuration.executor === '@nrwl/linter:eslint') {
+        if (configuration.executor === '@nx/eslint:lint' &&
+            // only add patterns if there are already hardcoded ones
+            configuration.options?.lintFilePatterns) {
             const opts = configuration.options ?? {};
             opts.lintFilePatterns ??= [];
             if (packageJson.generators) {

package/src/utils/testing-utils/async-commands.js

@@ -35,8 +35,9 @@ exports.runCommandAsync = runCommandAsync;
 function runNxCommandAsync(command, opts = {
     silenceError: false,
 }) {
+    const cwd = opts.cwd ?? (0, paths_1.tmpProjPath)();
     if ((0, utils_1.fileExists)((0, paths_1.tmpProjPath)('package.json'))) {
-        const pmc = (0, devkit_1.getPackageManagerCommand)();
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(cwd));
         return runCommandAsync(`${pmc.exec} nx ${command}`, opts);
     }
     else if (process.platform === 'win32') {

package/src/utils/testing-utils/commands.js

@@ -16,12 +16,13 @@ function runNxCommand(command, opts = {
     silenceError: false,
 }) {
     function _runNxCommand(c) {
+        const cwd = opts.cwd ?? (0, paths_1.tmpProjPath)();
         const execSyncOptions = {
-            cwd: opts.cwd ?? (0, paths_1.tmpProjPath)(),
+            cwd,
             env: { ...process.env, ...opts.env },
         };
         if ((0, utils_1.fileExists)((0, paths_1.tmpProjPath)('package.json'))) {
-            const pmc = (0, devkit_1.getPackageManagerCommand)();
+            const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(cwd));
             return (0, child_process_1.execSync)(`${pmc.exec} nx ${command}`, execSyncOptions);
         }
         else if (process.platform === 'win32') {

package/src/utils/testing-utils/nx-project.js

@@ -37,9 +37,10 @@ exports.uniq = uniq;
  * @param silent silent output from the install
  */
 function runPackageManagerInstall(silent = true) {
-    const pmc = (0, devkit_2.getPackageManagerCommand)();
+    const cwd = (0, paths_1.tmpProjPath)();
+    const pmc = (0, devkit_2.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(cwd));
     const install = (0, child_process_1.execSync)(pmc.install, {
-        cwd: (0, paths_1.tmpProjPath)(),
+        cwd,
         ...(silent ? { stdio: ['ignore', 'ignore', 'ignore'] } : {}),
     });
     return install ? install.toString() : '';