@nx/workspace 17.3.0-canary.20231213-3655269 → 17.3.0-canary.20231214-dc03c37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.3.0-canary.20231213-3655269",
+  "version": "17.3.0-canary.20231214-dc03c37",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-canary.20231213-3655269",
+    "@nx/devkit": "17.3.0-canary.20231214-dc03c37",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.3.0-canary.20231213-3655269",
-    "@nrwl/workspace": "17.3.0-canary.20231213-3655269"
+    "nx": "17.3.0-canary.20231214-dc03c37",
+    "@nrwl/workspace": "17.3.0-canary.20231214-dc03c37"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/convert-to-monorepo/convert-to-monorepo.js

@@ -11,10 +11,14 @@ async function monorepoGenerator(tree, options) {
     const projectsToMove = [];
     // Need to determine libs vs packages directory base on the type of root project.
     for (const [, project] of projects) {
-        if (project.root === '.')
+        if (project.root === '.') {
             rootProject = project;
-        projectsToMove.unshift(project); // move the root project 1st
+        }
+        else {
+            projectsToMove.push(project);
+        }
     }
+    projectsToMove.unshift(rootProject); // move the root project 1st
     // Currently, Nx only handles apps+libs or packages. You cannot mix and match them.
     // If the standalone project is an app (React, Angular, etc), then use apps+libs.
     // Otherwise, for TS standalone (lib), use packages.

package/src/generators/move/lib/extract-base-configs.d.ts

@@ -1,4 +1,4 @@
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 export declare function maybeExtractTsConfigBase(tree: Tree): void;
 export declare function maybeExtractJestConfigBase(tree: Tree): Promise<void>;
-export declare function maybeExtractEslintConfigIfRootProject(tree: Tree, rootProject: ProjectConfiguration): void;
+export declare function maybeMigrateEslintConfigIfRootProject(tree: Tree, rootProject: ProjectConfiguration): void;

package/src/generators/move/lib/extract-base-configs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeExtractEslintConfigIfRootProject = exports.maybeExtractJestConfigBase = exports.maybeExtractTsConfigBase = void 0;
+exports.maybeMigrateEslintConfigIfRootProject = exports.maybeExtractJestConfigBase = exports.maybeExtractTsConfigBase = void 0;
 const devkit_1 = require("@nx/devkit");
 function maybeExtractTsConfigBase(tree) {
     let extractTsConfigBase;
@@ -26,11 +26,7 @@ async function maybeExtractJestConfigBase(tree) {
     await jestInitGenerator(tree, {});
 }
 exports.maybeExtractJestConfigBase = maybeExtractJestConfigBase;
-function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
-    if (rootProject.root !== '.')
-        return;
-    if (tree.exists('.eslintrc.base.json'))
-        return;
+function maybeMigrateEslintConfigIfRootProject(tree, rootProject) {
     let migrateConfigToMonorepoStyle;
     try {
         migrateConfigToMonorepoStyle = require('@nx/' +
@@ -39,11 +35,9 @@ function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
     catch {
         // eslint not installed
     }
-    // Only need to handle migrating the root rootProject.
-    // If other libs/apps exist, then this migration is already done by `@nx/eslint:lint-rootProject` generator.
-    migrateConfigToMonorepoStyle?.([rootProject], tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
+    migrateConfigToMonorepoStyle?.(Array.from((0, devkit_1.getProjects)(tree).values()), tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
         tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.js'))
         ? 'jest'
         : 'none');
 }
-exports.maybeExtractEslintConfigIfRootProject = maybeExtractEslintConfigIfRootProject;
+exports.maybeMigrateEslintConfigIfRootProject = maybeMigrateEslintConfigIfRootProject;

package/src/generators/move/move.js

@@ -33,7 +33,6 @@ async function moveGeneratorInternal(tree, rawSchema) {
     if (projectConfig.root === '.') {
         (0, extract_base_configs_1.maybeExtractTsConfigBase)(tree);
         await (0, extract_base_configs_1.maybeExtractJestConfigBase)(tree);
-        (0, extract_base_configs_1.maybeExtractEslintConfigIfRootProject)(tree, projectConfig);
         // Reload config since it has been updated after extracting base configs
         projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
     }
@@ -51,6 +50,10 @@ async function moveGeneratorInternal(tree, rawSchema) {
     (0, update_build_targets_1.updateBuildTargets)(tree, schema);
     (0, update_default_project_1.updateDefaultProject)(tree, schema);
     (0, update_implicit_dependencies_1.updateImplicitDependencies)(tree, schema);
+    if (projectConfig.root === '.') {
+        // we want to migrate eslint config once the root project files are moved
+        (0, extract_base_configs_1.maybeMigrateEslintConfigIfRootProject)(tree, projectConfig);
+    }
     await (0, run_angular_plugin_1.runAngularPlugin)(tree, schema);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);