nx 19.8.0-canary.20240911-2a3307c → 19.8.0-canary.20240912-b6140d4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.8.0-canary.20240911-2a3307c",
+  "version": "19.8.0-canary.20240912-b6140d4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.8.0-canary.20240911-2a3307c"
+    "@nrwl/tao": "19.8.0-canary.20240912-b6140d4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-darwin-arm64": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-linux-x64-gnu": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-linux-x64-musl": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-win32-x64-msvc": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-linux-arm64-gnu": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-linux-arm64-musl": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-win32-arm64-msvc": "19.8.0-canary.20240911-2a3307c",
-    "@nx/nx-freebsd-x64": "19.8.0-canary.20240911-2a3307c"
+    "@nx/nx-darwin-x64": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-darwin-arm64": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-linux-x64-gnu": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-linux-x64-musl": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-win32-x64-msvc": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-linux-arm64-gnu": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-linux-arm64-musl": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-win32-arm64-msvc": "19.8.0-canary.20240912-b6140d4",
+    "@nx/nx-freebsd-x64": "19.8.0-canary.20240912-b6140d4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/import/import.js

@@ -116,6 +116,9 @@ async function importHandler(options) {
         ])).destination;
     }
     const absSource = (0, path_1.join)(sourceTempRepoPath, source);
+    if ((0, path_1.isAbsolute)(destination)) {
+        throw new Error(`The destination directory must be a relative path in this repository.`);
+    }
     const absDestination = (0, path_1.join)(process.cwd(), destination);
     const destinationGitClient = new git_utils_1.GitRepository(process.cwd());
     await assertDestinationEmpty(destinationGitClient, absDestination);
@@ -137,6 +140,7 @@ async function importHandler(options) {
     }
     const packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot);
     const originalPackageWorkspaces = await (0, needs_install_1.getPackagesInPackageManagerWorkspace)(packageManager);
+    const sourceIsNxWorkspace = (0, node_fs_1.existsSync)((0, path_1.join)(sourceGitClient.root, 'nx.json'));
     const relativeDestination = (0, path_1.relative)(destinationGitClient.root, absDestination);
     await (0, prepare_source_repo_1.prepareSourceRepo)(sourceGitClient, ref, source, relativeDestination, tempImportBranch, sourceRepository);
     await createTemporaryRemote(destinationGitClient, (0, path_1.join)(sourceTempRepoPath, '.git'), importRemoteName);
@@ -201,6 +205,18 @@ async function importHandler(options) {
         });
     }
     await warnOnMissingWorkspacesEntry(packageManager, pmc, relativeDestination);
+    if (source != destination) {
+        output_1.output.warn({
+            title: `Check configuration files`,
+            bodyLines: [
+                `The source directory (${source}) and destination directory (${destination}) are different.`,
+                `You may need to update configuration files to match the directory in this repository.`,
+                sourceIsNxWorkspace
+                    ? `For example, path options in project.json such as "main", "tsConfig", and "outputPath" need to be updated.`
+                    : `For example, relative paths in tsconfig.json and other tooling configuration files may need to be updated.`,
+            ],
+        });
+    }
     // When only a subdirectory is imported, there might be devDependencies in the root package.json file
     // that needs to be ported over as well.
     if (ref) {