@nx/workspace 17.0.0-rc.3 → 17.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.0.0-rc.3",
+  "version": "17.0.1",
   "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.0.0-rc.3",
+    "@nx/devkit": "17.0.1",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.0.0-rc.3",
-    "@nrwl/workspace": "17.0.0-rc.3"
+    "nx": "17.0.1",
+    "@nrwl/workspace": "17.0.1"
   },
   "publishConfig": {
     "access": "public"

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

@@ -13,7 +13,7 @@ async function monorepoGenerator(tree, options) {
     for (const [, project] of projects) {
         if (project.root === '.')
             rootProject = project;
-        projectsToMove.push(project);
+        projectsToMove.unshift(project); // 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.

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

@@ -41,7 +41,7 @@ function maybeExtractEslintConfigIfRootProject(tree, rootProject) {
     }
     // 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.name], tree, tree.exists((0, devkit_1.joinPathFragments)(rootProject.root, 'jest.config.ts')) ||
+    migrateConfigToMonorepoStyle?.([rootProject], 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');

package/src/generators/move/lib/update-eslint-config.js

@@ -9,7 +9,10 @@ const devkit_1 = require("@nx/devkit");
  */
 function updateEslintConfig(tree, schema, project) {
     // if there is no suitable eslint config, we don't need to do anything
-    if (!tree.exists('.eslintrc.json') && !tree.exists('eslint.config.js')) {
+    if (!tree.exists('.eslintrc.json') &&
+        !tree.exists('eslint.config.js') &&
+        !tree.exists('.eslintrc.base.json') &&
+        !tree.exists('eslint.base.config.js')) {
         return;
     }
     try {

package/src/generators/move/lib/update-imports.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateImports = void 0;
 const devkit_1 = require("@nx/devkit");
-const ts_config_1 = require("../../../utilities/ts-config");
-const utils_1 = require("./utils");
 const path_1 = require("path");
-const typescript_1 = require("../../../utilities/typescript");
 const get_import_path_1 = require("../../../utilities/get-import-path");
+const ts_config_1 = require("../../../utilities/ts-config");
+const typescript_1 = require("../../../utilities/typescript");
+const utils_1 = require("./utils");
 let tsModule;
 /**
  * Updates all the imports in the workspace and modifies the tsconfig appropriately.
@@ -118,7 +118,10 @@ function updateImportDeclarations(sourceFile, from, to) {
     if (!tsModule) {
         tsModule = (0, typescript_1.ensureTypescript)();
     }
-    const importDecls = (0, ts_config_1.findNodes)(sourceFile, tsModule.SyntaxKind.ImportDeclaration);
+    const importDecls = (0, ts_config_1.findNodes)(sourceFile, [
+        tsModule.SyntaxKind.ImportDeclaration,
+        tsModule.SyntaxKind.ExportDeclaration,
+    ]);
     const changes = [];
     for (const { moduleSpecifier } of importDecls) {
         if (tsModule.isStringLiteral(moduleSpecifier)) {