@nx/workspace 19.3.0-canary.20240612-4a5eb23 → 19.3.0-canary.20240613-c86de97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "19.3.0-canary.20240612-4a5eb23",
+  "version": "19.3.0-canary.20240613-c86de97",
   "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": "19.3.0-canary.20240612-4a5eb23",
+    "@nx/devkit": "19.3.0-canary.20240613-c86de97",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "19.3.0-canary.20240612-4a5eb23",
-    "@nrwl/workspace": "19.3.0-canary.20240612-4a5eb23"
+    "nx": "19.3.0-canary.20240613-c86de97",
+    "@nrwl/workspace": "19.3.0-canary.20240613-c86de97"
   },
   "publishConfig": {
     "access": "public"

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

@@ -25,6 +25,18 @@ async function monorepoGenerator(tree, options) {
     const isRootProjectApp = rootProject.projectType === 'application';
     const appsDir = isRootProjectApp ? 'apps' : 'packages';
     const libsDir = isRootProjectApp ? 'libs' : 'packages';
+    if (rootProject) {
+        // If project was created using `nx init` then it might not have project.json.
+        // Need to create one to avoid name conflicts with root package.json.
+        if (!tree.exists('project.json')) {
+            (0, devkit_1.writeJson)(tree, 'project.json', { name: rootProject.name });
+        }
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            // Avoid name conflicts once we move root project into its own folder.
+            json.name = `@${rootProject.name}/source`;
+            return json;
+        });
+    }
     for (const project of projectsToMove) {
         await (0, move_1.moveGenerator)(tree, {
             projectName: project.name,

package/src/generators/move/lib/move-project-files.js

@@ -15,10 +15,7 @@ function moveProjectFiles(tree, schema, project) {
     const knownRootProjectFiles = [
         // Config files
         'project.json',
-        'tsconfig.json',
-        'tsconfig.app.json',
-        'tsconfig.lib.json',
-        'tsconfig.spec.json',
+        /^tsconfig(?!\.base\.json$)((\..+)?\.json$|json$)/,
         '.babelrc',
         '.eslintrc.json',
         'eslint.config.js',