nx 21.6.2 → 21.6.3

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk_nx_graph_client=self.webpackChunk_nx_graph_client||[]).push([[869],{2058:()=>{}},e=>{var n;n=2058,e(e.s=n)}]);
+"use strict";(self.webpackChunk_nx_graph_client=self.webpackChunk_nx_graph_client||[]).push([[869],{7337:()=>{}},e=>{var n;n=7337,e(e.s=n)}]);

package/src/native/index.d.ts

@@ -251,9 +251,9 @@ export interface InputsInput {
   projects?: string | Array<string>
 }
 
-export declare export declare function installNxConsole(): void
+export declare export declare function installNxConsole(): boolean
 
-export declare export declare function installNxConsoleForEditor(editor: SupportedEditor): void
+export declare export declare function installNxConsoleForEditor(editor: SupportedEditor): boolean
 
 export const IS_WASM: boolean
 

package/src/project-graph/file-utils.d.ts

@@ -3,7 +3,8 @@ import type { NxArgs } from '../utils/command-line-utils';
 export interface Change {
     type: string;
 }
-export interface FileChange<T extends Change = Change> extends FileData {
+export interface FileChange<T extends Change = Change> {
+    file: string;
     getChanges: () => T[];
 }
 export declare class WholeFileChange implements Change {
@@ -14,7 +15,9 @@ export declare class DeletedFileChange implements Change {
 }
 export declare function isWholeFileChange(change: Change): change is WholeFileChange;
 export declare function isDeletedFileChange(change: Change): change is DeletedFileChange;
-export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?: ReturnType<typeof ignore>): FileChange[];
+export declare function calculateFileChanges(files: string[], nxArgs?: NxArgs, readFileAtRevision?: {
+    (f: string, r: string | void): string;
+}, ignore?: ReturnType<typeof ignore>): FileChange[];
 export declare const TEN_MEGABYTES: number;
 export declare function defaultFileRead(filePath: string): string | null;
 export declare function readPackageJson(root?: string): any;

package/src/project-graph/file-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAM1D,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,QAAQ;IACrE,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;CACvB;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC5C,IAAI,SAAqB;CAC1B;AAED,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,IAAI,SAAsB;CAC3B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,eAAe,CAE3E;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,GACb,MAAM,IAAI,iBAAiB,CAE7B;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,MAAM,CAAC,EAAE,MAAM,EACf,kBAAkB,GAAE,CAClB,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,IAAI,GAAG,MAAM,KACb,MAAkC,EACvC,MAAM,GAAwB,UAAU,CAAC,OAAO,MAAM,CAAC,GACtD,UAAU,EAAE,CAiDd;AAED,eAAO,MAAM,aAAa,QAAe,CAAC;AA4B1C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/D;AAED,wBAAgB,eAAe,CAAC,IAAI,GAAE,MAAsB,GAAG,GAAG,CAMjE;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAM1D,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC,EAAE,CAAC;CACvB;AAED,qBAAa,eAAgB,YAAW,MAAM;IAC5C,IAAI,SAAqB;CAC1B;AAED,qBAAa,iBAAkB,YAAW,MAAM;IAC9C,IAAI,SAAsB;CAC3B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,eAAe,CAE3E;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,GACb,MAAM,IAAI,iBAAiB,CAE7B;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,CAAC,EAAE,MAAM,EACf,kBAAkB,GAAE;IAClB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC;CACX,EAC7B,MAAM,GAAwB,UAAU,CAAC,OAAO,MAAM,CAAC,GACtD,UAAU,EAAE,CA6Cd;AAED,eAAO,MAAM,aAAa,QAAe,CAAC;AA4B1C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAE/D;AAED,wBAAgB,eAAe,CAAC,IAAI,GAAE,MAAsB,GAAG,GAAG,CAMjE;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAC"}

package/src/project-graph/file-utils.js

@@ -31,16 +31,12 @@ function isWholeFileChange(change) {
 function isDeletedFileChange(change) {
     return change.type === 'WholeFileDeleted';
 }
-function calculateFileChanges(files, allWorkspaceFiles, nxArgs, readFileAtRevision = defaultReadFileAtRevision, ignore = (0, ignore_1.getIgnoreObject)()) {
+function calculateFileChanges(files, nxArgs, readFileAtRevision = defaultReadFileAtRevision, ignore = (0, ignore_1.getIgnoreObject)()) {
     files = files.filter((f) => !ignore.ignores(f));
     return files.map((f) => {
         const ext = (0, path_1.extname)(f);
-        const file = allWorkspaceFiles.find((fileData) => fileData.file == f);
-        const hash = file?.hash;
         return {
             file: f,
-            ext,
-            hash,
             getChanges: () => {
                 if (!(0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, f))) {
                     return [new DeletedFileChange()];

package/src/utils/nx-console-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-console-prompt.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-console-prompt.ts"],"names":[],"mappings":"AASA,wBAAsB,wBAAwB,kBA4B7C"}
+{"version":3,"file":"nx-console-prompt.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/nx-console-prompt.ts"],"names":[],"mappings":"AASA,wBAAsB,wBAAwB,kBA+B7C"}

package/src/utils/nx-console-prompt.js

@@ -26,7 +26,10 @@ async function ensureNxConsoleInstalled() {
         preferences.setAutoInstallPreference(setting);
     }
     if (setting) {
-        (0, native_1.installNxConsole)();
+        const installed = (0, native_1.installNxConsole)();
+        if (installed) {
+            output_1.output.log({ title: 'Successfully installed Nx Console!' });
+        }
     }
 }
 /**

package/src/utils/provenance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provenance.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/provenance.ts"],"names":[],"mappings":"AAaA,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,CA8Gf;AAED,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;CAOxE;AAED,wBAAgB,iBAAiB,IAAI,MAAM,EAAE,CAa5C;AAoBD,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,iCAAiC,CAAC;IACzC,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,aAAa,EAAE,gCAAgC,CAAC;IAChD,SAAS,EAAE;QACT,eAAe,EAAE;YACf,SAAS,EAAE,MAAM,CAAC;YAClB,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzC,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC;SAC7C,CAAC;QACF,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,EAAE,EAAE,MAAM,CAAC;gBACX,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;gBAC3C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAClC,CAAC;YACF,QAAQ,CAAC,EAAE;gBACT,YAAY,CAAC,EAAE,MAAM,CAAC;gBACtB,SAAS,CAAC,EAAE,MAAM,CAAC;gBACnB,UAAU,CAAC,EAAE,MAAM,CAAC;aACrB,CAAC;YACF,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;SACnC,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KACnC,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH"}
+{"version":3,"file":"provenance.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/provenance.ts"],"names":[],"mappings":"AAiBA,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,IAAI,CAAC,CA4Gf;AAED,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;CAoCxE;AAED,wBAAgB,iBAAiB,IAAI,MAAM,EAAE,CAa5C;AAoBD,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,iCAAiC,CAAC;IACzC,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,aAAa,EAAE,gCAAgC,CAAC;IAChD,SAAS,EAAE;QACT,eAAe,EAAE;YACf,SAAS,EAAE,MAAM,CAAC;YAClB,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzC,oBAAoB,CAAC,EAAE,kBAAkB,EAAE,CAAC;SAC7C,CAAC;QACF,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,EAAE,EAAE,MAAM,CAAC;gBACX,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAC;gBAC3C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAClC,CAAC;YACF,QAAQ,CAAC,EAAE;gBACT,YAAY,CAAC,EAAE,MAAM,CAAC;gBACtB,SAAS,CAAC,EAAE,MAAM,CAAC;gBACnB,UAAU,CAAC,EAAE,MAAM,CAAC;aACrB,CAAC;YACF,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAC;SACnC,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KACnC,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH"}

package/src/utils/provenance.js

@@ -5,8 +5,8 @@ exports.ensurePackageHasProvenance = ensurePackageHasProvenance;
 exports.getNxPackageGroup = getNxPackageGroup;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
-const util_1 = require("util");
 const fileutils_1 = require("./fileutils");
+const package_manager_1 = require("./package-manager");
 /*
  * Verifies that the given npm package has provenance attestations
  * generated by the GitHub Actions workflow at .github/workflows/publish.yml
@@ -20,12 +20,9 @@ async function ensurePackageHasProvenance(packageName, packageVersion) {
     if (process.env.NX_SKIP_PROVENANCE_CHECK) {
         return;
     }
-    const execAsync = (0, util_1.promisify)(child_process_1.exec);
     try {
-        const result = await execAsync(`npm view ${packageName}@${packageVersion} --json --silent`, {
-            timeout: 20000,
-        });
-        const npmViewResult = JSON.parse(result.stdout.trim());
+        const result = await (0, package_manager_1.packageRegistryView)(packageName, packageVersion, '--json --silent');
+        const npmViewResult = JSON.parse(result);
         const attURL = npmViewResult.dist?.attestations?.url;
         if (!attURL)
             throw new ProvenanceError(packageName, packageVersion, 'No attestation URL found');
@@ -68,7 +65,31 @@ async function ensurePackageHasProvenance(packageName, packageVersion) {
 }
 class ProvenanceError extends Error {
     constructor(packageName, packageVersion, error) {
-        super(`An error occurred while checking the provenance of ${packageName}@${packageVersion}. This could indicate a security risk. Please double check https://www.npmjs.com/package/${packageName} to see if the package is published correctly or file an issue at https://github.com/nrwl/nx/issues. To disable this check at your own risk, you can set the NX_SKIP_PROVENANCE_CHECK environment variable to true. \n Error: ${error ?? ''}`);
+        let customRegistry = undefined;
+        try {
+            const packageManager = (0, package_manager_1.detectPackageManager)();
+            const commands = (0, package_manager_1.getPackageManagerCommand)(packageManager);
+            // Try to get registry from current package manager, fall back to npm
+            const registryCommand = commands.getRegistryUrl ?? 'npm config get registry';
+            const registry = (0, child_process_1.execSync)(registryCommand, {
+                timeout: 5000,
+                windowsHide: true,
+                encoding: 'utf-8',
+            }).trim();
+            // Only consider it custom if it's not the default npm registry
+            if (registry &&
+                registry !== 'undefined' &&
+                !registry.includes('registry.npmjs.org')) {
+                customRegistry = registry;
+            }
+        }
+        catch {
+            // If we can't determine the registry, proceed with default error message
+        }
+        const registryNote = customRegistry
+            ? `This might be due to a custom registry configuration (${customRegistry}). Please check whether provenance is correctly configured for your registry.`
+            : `This could indicate a security risk. Please double check https://www.npmjs.com/package/${packageName} to see if the package is published correctly or file an issue at https://github.com/nrwl/nx/issues.`;
+        super(`An error occurred while checking the provenance of ${packageName}@${packageVersion}. ${registryNote} To disable this check at your own risk, you can set the NX_SKIP_PROVENANCE_CHECK environment variable to true. \n Error: ${error ?? ''}`);
     }
 }
 exports.ProvenanceError = ProvenanceError;