nx 19.6.0 → 19.6.2

package/src/native/assert-supported-platform.js

@@ -18,7 +18,7 @@ function assertSupportedPlatform() {
                 `The Nx CLI could not find or load the native binary for your supported platform (${process.platform}-${process.arch}).`,
                 'This likely means that optional dependencies were not installed correctly, or your system is missing some system dependencies.',
             ];
-            if (process.env.NX_VERBOSE_LOGGING == 'true') {
+            if (process.env.NX_VERBOSE_LOGGING === 'true') {
                 bodyLines.push('', 'Additional error information:', e.message);
             }
         }

package/src/nx-cloud/utilities/url-shorten.d.ts

@@ -1,3 +1,6 @@
+/**
+ * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
+ */
 export declare function createNxCloudOnboardingURL(onboardingSource: string, accessToken?: string, usesGithub?: boolean, meta?: string): Promise<string>;
 export declare function repoUsesGithub(github?: boolean, githubSlug?: string, apiUrl?: string): Promise<boolean>;
 export declare function getURLifShortenFailed(usesGithub: boolean, githubSlug: string | null, apiUrl: string, source: string, accessToken?: string): string;

package/src/nx-cloud/utilities/url-shorten.js

@@ -10,6 +10,9 @@ exports.compareCleanCloudVersions = compareCleanCloudVersions;
 const devkit_exports_1 = require("../../devkit-exports");
 const git_utils_1 = require("../../utils/git-utils");
 const get_cloud_options_1 = require("./get-cloud-options");
+/**
+ * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
+ */
 async function createNxCloudOnboardingURL(onboardingSource, accessToken, usesGithub, meta) {
     const githubSlug = (0, git_utils_1.getGithubSlugOrNull)();
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
@@ -92,7 +95,7 @@ async function getInstallationSupportsGitHub(apiUrl) {
         return !!response.data.isGithubIntegrationEnabled;
     }
     catch (e) {
-        if (process.env.NX_VERBOSE_LOGGING) {
+        if (process.env.NX_VERBOSE_LOGGING === 'true') {
             devkit_exports_1.logger.warn(`Failed to access system features. GitHub integration assumed to be disabled. 
     ${e}`);
         }

package/src/plugins/js/package-json/create-package-json.d.ts

@@ -18,6 +18,7 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
     root?: string;
     isProduction?: boolean;
     helperDependencies?: string[];
+    skipPackageManager?: boolean;
 }, fileMap?: ProjectFileMap): PackageJson;
 export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: {
     helperDependencies?: string[];

package/src/plugins/js/package-json/create-package-json.js

@@ -108,7 +108,7 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     packageJson.dependencies &&= (0, object_sort_1.sortObjectByKeys)(packageJson.dependencies);
     packageJson.peerDependencies &&= (0, object_sort_1.sortObjectByKeys)(packageJson.peerDependencies);
     packageJson.peerDependenciesMeta &&= (0, object_sort_1.sortObjectByKeys)(packageJson.peerDependenciesMeta);
-    if (rootPackageJson.packageManager) {
+    if (rootPackageJson.packageManager && !options.skipPackageManager) {
         if (packageJson.packageManager &&
             packageJson.packageManager !== rootPackageJson.packageManager) {
             output_1.output.warn({

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -140,15 +140,20 @@ class TargetProjectLocator {
                 return externalNodeName;
             }
             const version = (0, semver_1.clean)(externalPackageJson.version);
-            const npmProjectKey = `npm:${externalPackageJson.name}@${version}`;
-            let matchingExternalNode = this.npmProjects[npmProjectKey];
+            let matchingExternalNode = this.npmProjects[`npm:${externalPackageJson.name}@${version}`];
             if (!matchingExternalNode) {
                 // check if it's a package alias, where the resolved package key is used as the version
-                const aliasNpmProjectKey = `npm:${packageName}@${npmProjectKey}`;
+                const aliasNpmProjectKey = `npm:${packageName}@npm:${externalPackageJson.name}@${version}`;
                 matchingExternalNode = this.npmProjects[aliasNpmProjectKey];
-                if (!matchingExternalNode) {
-                    return null;
-                }
+            }
+            if (!matchingExternalNode) {
+                // Fallback to package name as key. This can happen if the version in project graph is not the same as in the resolved package.json.
+                // e.g. Version in project graph is a git remote, but the resolved version is semver.
+                matchingExternalNode =
+                    this.npmProjects[`npm:${externalPackageJson.name}`];
+            }
+            if (!matchingExternalNode) {
+                return null;
             }
             this.npmResolutionCache.set(npmImportForProject, matchingExternalNode.name);
             return matchingExternalNode.name;

package/src/tasks-runner/cache.js

@@ -44,7 +44,7 @@ class Cache {
                 this._currentMachineId = await (0, node_machine_id_1.machineId)();
             }
             catch (e) {
-                if (process.env.NX_VERBOSE_LOGGING == 'true') {
+                if (process.env.NX_VERBOSE_LOGGING === 'true') {
                     console.log(`Unable to get machineId. Error: ${e.message}`);
                 }
                 this._currentMachineId = '';

package/src/utils/git-utils.d.ts

@@ -33,6 +33,9 @@ export declare class GitRepository {
  */
 export declare function updateRebaseFile(contents: string): string;
 export declare function fetchGitRemote(name: string, branch: string, execOptions: ExecSyncOptions): string | Buffer;
+/**
+ * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
+ */
 export declare function getGithubSlugOrNull(): string | null;
 export declare function extractUserAndRepoFromGitHubUrl(gitRemotes: string): string | null;
 export declare function commitChanges(commitMessage: string, directory?: string): string | null;

package/src/utils/git-utils.js

@@ -83,7 +83,7 @@ class GitRepository {
         return this.execAsync(`git checkout ${opts.new ? '-b ' : ' '}${branch}${opts.base ? ' ' + opts.base : ''}`);
     }
     async move(path, destination) {
-        return this.execAsync(`git mv ${path} ${destination}`);
+        return this.execAsync(`git mv "${path}" "${destination}"`);
     }
     async push(ref, remoteName) {
         return this.execAsync(`git push -u -f ${remoteName} ${ref}`);
@@ -117,6 +117,9 @@ function updateRebaseFile(contents) {
 function fetchGitRemote(name, branch, execOptions) {
     return (0, child_process_1.execSync)(`git fetch ${name} ${branch} --depth 1`, execOptions);
 }
+/**
+ * This is currently duplicated in Nx Console. Please let @MaxKless know if you make changes here.
+ */
 function getGithubSlugOrNull() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v', {

package/src/utils/logger.js

@@ -36,7 +36,7 @@ exports.logger = {
         console.error(...s);
     },
     verbose: (...s) => {
-        if (process.env.NX_VERBOSE_LOGGING) {
+        if (process.env.NX_VERBOSE_LOGGING === 'true') {
             console.log(...s);
         }
     },