diff --git a/package.json b/package.json index ccf9f3716a..ae4b7b5def 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "@nuxt/kit": "^3.10.0", "@nuxt/schema": "^3.10.0", "@nx/angular": "20.5.0-rc.4", + "@nx/conformance": "1.3.0-beta.7", "@nx/cypress": "20.5.0-rc.4", "@nx/devkit": "20.5.0-rc.4", "@nx/esbuild": "20.5.0-rc.4", @@ -78,11 +79,12 @@ "@nx/eslint-plugin": "20.5.0-rc.4", "@nx/jest": "20.5.0-rc.4", "@nx/js": "20.5.0-rc.4", + "@nx/key": "1.3.0-beta.7", "@nx/next": "20.5.0-rc.4", "@nx/playwright": "20.5.0-rc.4", - "@nx/powerpack-conformance": "1.2.5", - "@nx/powerpack-enterprise-cloud": "1.2.5", - "@nx/powerpack-license": "1.2.5", + "@nx/powerpack-conformance": "1.3.0-beta.7", + "@nx/powerpack-enterprise-cloud": "1.3.0-beta.7", + "@nx/powerpack-license": "1.3.0-beta.7", "@nx/react": "20.5.0-rc.4", "@nx/rsbuild": "20.5.0-rc.4", "@nx/rspack": "20.5.0-rc.4", diff --git a/packages/nx/.eslintrc.json b/packages/nx/.eslintrc.json index 0a17de40bb..8ed6c6cf45 100644 --- a/packages/nx/.eslintrc.json +++ b/packages/nx/.eslintrc.json @@ -131,8 +131,10 @@ "@nx/nx-win32-arm64-msvc", "@nx/nx-freebsd-x64", "@nx/powerpack-license", + "@nx/key", // Powerpack plugin conditionally available dynamically at runtime - "@nx/powerpack-conformance" + "@nx/powerpack-conformance", + "@nx/conformance" ] } ] diff --git a/packages/nx/src/command-line/activate-powerpack/activate-powerpack.ts b/packages/nx/src/command-line/activate-powerpack/activate-powerpack.ts deleted file mode 100644 index f80e28dcda..0000000000 --- a/packages/nx/src/command-line/activate-powerpack/activate-powerpack.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { workspaceRoot } from '../../utils/workspace-root'; -import { ActivatePowerpackOptions } from './command-object'; -import { prompt } from 'enquirer'; -import { execSync } from 'child_process'; -import { getPackageManagerCommand } from '../../utils/package-manager'; - -export async function handleActivatePowerpack( - options: ActivatePowerpackOptions -) { - const license = - options.license ?? - (await prompt({ - type: 'input', - name: 'license', - message: 'Enter your License Key', - })); - const { activatePowerpack } = await requirePowerpack(); - activatePowerpack(workspaceRoot, license); -} - -async function requirePowerpack(): Promise { - // @ts-ignore - return import('@nx/powerpack-license').catch(async (e) => { - if ('code' in e && e.code === 'MODULE_NOT_FOUND') { - try { - execSync( - `${getPackageManagerCommand().addDev} @nx/powerpack-license@latest`, - { - windowsHide: false, - } - ); - - // @ts-ignore - return await import('@nx/powerpack-license'); - } catch (e) { - throw new Error( - 'Failed to install @nx/powerpack-license. Please install @nx/powerpack-license and try again.' - ); - } - } - }); -} diff --git a/packages/nx/src/command-line/activate-powerpack/command-object.ts b/packages/nx/src/command-line/activate-powerpack/command-object.ts deleted file mode 100644 index 393828eb36..0000000000 --- a/packages/nx/src/command-line/activate-powerpack/command-object.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { CommandModule } from 'yargs'; -import { withVerbose } from '../yargs-utils/shared-options'; -import { handleErrors } from '../../utils/handle-errors'; - -export interface ActivatePowerpackOptions { - license: string; - verbose: boolean; -} - -export const yargsActivatePowerpackCommand: CommandModule< - {}, - ActivatePowerpackOptions -> = { - command: 'activate-powerpack ', - describe: false, - // describe: 'Activate a Nx Powerpack license.', - builder: (yargs) => - withVerbose(yargs) - .parserConfiguration({ - 'strip-dashed': true, - 'unknown-options-as-args': true, - }) - .positional('license', { - type: 'string', - description: 'This is a License Key for Nx Powerpack.', - }) - .example( - '$0 activate-powerpack ', - 'Activate a Nx Powerpack license' - ), - handler: async (args) => { - const exitCode = await handleErrors(args.verbose as boolean, async () => { - return (await import('./activate-powerpack')).handleActivatePowerpack( - args - ); - }); - process.exit(exitCode); - }, -}; diff --git a/packages/nx/src/command-line/nx-commands.ts b/packages/nx/src/command-line/nx-commands.ts index be2d58884e..98b0ae87bd 100644 --- a/packages/nx/src/command-line/nx-commands.ts +++ b/packages/nx/src/command-line/nx-commands.ts @@ -1,7 +1,7 @@ import * as chalk from 'chalk'; import * as yargs from 'yargs'; -import { yargsActivatePowerpackCommand } from './activate-powerpack/command-object'; +import { yargsRegisterCommand } from './register/command-object'; import { yargsAffectedBuildCommand, yargsAffectedCommand, @@ -65,7 +65,7 @@ export const commandsObject = yargs .parserConfiguration(parserConfiguration) .usage(chalk.bold('Smart Monorepos ยท Fast CI')) .demandCommand(1, '') - .command(yargsActivatePowerpackCommand) + .command(yargsRegisterCommand) .command(yargsAddCommand) .command(yargsAffectedBuildCommand) .command(yargsAffectedCommand) @@ -121,7 +121,7 @@ function createMissingConformanceCommand( output.error({ title: `${command} is not available`, bodyLines: [ - `In order to use the \`nx ${command}\` command you must have an active Powerpack license and the \`@nx/powerpack-conformance\` plugin installed.`, + `In order to use the \`nx ${command}\` command you must have an active Nx key and the \`@nx/conformance\` plugin installed.`, '', 'To learn more, visit https://nx.dev/nx-enterprise/powerpack/conformance', ], @@ -133,7 +133,13 @@ function createMissingConformanceCommand( function resolveConformanceCommandObject() { try { - const { yargsConformanceCommand } = require('@nx/powerpack-conformance'); + const { yargsConformanceCommand } = (() => { + try { + return require('@nx/powerpack-conformance'); + } catch { + return require('@nx/conformance'); + } + })(); return yargsConformanceCommand; } catch { return createMissingConformanceCommand('conformance'); @@ -142,9 +148,13 @@ function resolveConformanceCommandObject() { function resolveConformanceCheckCommandObject() { try { - const { - yargsConformanceCheckCommand, - } = require('@nx/powerpack-conformance'); + const { yargsConformanceCheckCommand } = (() => { + try { + return require('@nx/powerpack-conformance'); + } catch { + return require('@nx/conformance'); + } + })(); return yargsConformanceCheckCommand; } catch { return createMissingConformanceCommand('conformance:check'); diff --git a/packages/nx/src/command-line/register/command-object.ts b/packages/nx/src/command-line/register/command-object.ts new file mode 100644 index 0000000000..2ada8b3347 --- /dev/null +++ b/packages/nx/src/command-line/register/command-object.ts @@ -0,0 +1,31 @@ +import { CommandModule } from 'yargs'; +import { withVerbose } from '../yargs-utils/shared-options'; +import { handleErrors } from '../../utils/handle-errors'; + +export interface RegisterOptions { + key?: string; + verbose?: boolean; +} + +export const yargsRegisterCommand: CommandModule<{}, RegisterOptions> = { + command: 'register ', + aliases: ['activate-powerpack'], + describe: false, + builder: (yargs) => + withVerbose(yargs) + .parserConfiguration({ + 'strip-dashed': true, + 'unknown-options-as-args': true, + }) + .positional('key', { + type: 'string', + description: 'This is a key for Nx.', + }) + .example('$0 register ', 'Register a Nx key'), + handler: async (args) => { + const exitCode = await handleErrors(args.verbose ?? false, async () => { + return (await import('./register')).handleRegister(args); + }); + process.exit(exitCode); + }, +}; diff --git a/packages/nx/src/command-line/register/register.ts b/packages/nx/src/command-line/register/register.ts new file mode 100644 index 0000000000..2b3a0bc2f4 --- /dev/null +++ b/packages/nx/src/command-line/register/register.ts @@ -0,0 +1,28 @@ +import { workspaceRoot } from '../../utils/workspace-root'; +import { RegisterOptions } from './command-object'; +import { prompt } from 'enquirer'; +import { requireNxKey } from '../../utils/require-nx-key'; + +export async function handleRegister(options: RegisterOptions) { + const nxKey = await requireNxKey(); + + // If a key was provided through options, activate it directly + if (options.key) { + return nxKey.activateNxKey(workspaceRoot, options.key); + } + + // Try to auto-register a key + const generatedKey = await nxKey.autoRegisterNxKey(workspaceRoot); + if (generatedKey) { + return; + } + + // If auto-registration was skipped, prompt for a key + const { key } = await prompt<{ key: string }>({ + type: 'input', + name: 'key', + message: 'Enter your key', + }); + + return nxKey.activateNxKey(workspaceRoot, key); +} diff --git a/packages/nx/src/command-line/report/report.ts b/packages/nx/src/command-line/report/report.ts index 3191978098..e42701781b 100644 --- a/packages/nx/src/command-line/report/report.ts +++ b/packages/nx/src/command-line/report/report.ts @@ -24,10 +24,11 @@ import { NxJsonConfiguration, readNxJson } from '../../config/nx-json'; import { ProjectGraph } from '../../config/project-graph'; import { ProjectGraphError } from '../../project-graph/error-types'; import { - getPowerpackLicenseInformation, - NxPowerpackNotInstalledError, -} from '../../utils/powerpack'; -import type { PowerpackLicense } from '@nx/powerpack-license'; + getNxKeyInformation, + NxKeyNotInstalledError, + createNxKeyLicenseeInformation, +} from '../../utils/nx-key'; +import { type NxKey } from '@nx/key'; const nxPackageJson = readJsonFile( join(__dirname, '../../../package.json') @@ -64,8 +65,8 @@ export async function reportHandler() { const { pm, pmVersion, - powerpackLicense, - powerpackError, + nxKey, + nxKeyError, localPlugins, powerpackPlugins, communityPlugins, @@ -97,49 +98,43 @@ export async function reportHandler() { ); }); - if (powerpackLicense) { + if (nxKey) { bodyLines.push(''); bodyLines.push(LINE_SEPARATOR); - bodyLines.push(chalk.green('Nx Powerpack')); + bodyLines.push(chalk.green('Nx key licensed packages')); - const licenseExpiryDate = new Date( - (powerpackLicense.realExpiresAt ?? powerpackLicense.expiresAt) * 1000 - ); + bodyLines.push(createNxKeyLicenseeInformation(nxKey)); - bodyLines.push( - `Licensed to ${powerpackLicense.organizationName} for ${ - powerpackLicense.seatCount - } user${powerpackLicense.seatCount > 1 ? 's' : ''} in ${ - powerpackLicense.workspaceCount === 9999 - ? 'an unlimited number of' - : powerpackLicense.workspaceCount - } workspace${powerpackLicense.workspaceCount > 1 ? 's' : ''}.` - ); + if (nxKey.realExpiresAt || nxKey.expiresAt) { + const licenseExpiryDate = new Date( + (nxKey.realExpiresAt ?? nxKey.expiresAt) * 1000 + ); - // license is not expired - if (licenseExpiryDate.getTime() >= Date.now()) { - if ('perpetualNxVersion' in powerpackLicense) { - bodyLines.push( - `License expires on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${ - powerpackLicense.perpetualNxVersion - } and below.` - ); + // license is not expired + if (licenseExpiryDate.getTime() >= Date.now()) { + if ('perpetualNxVersion' in nxKey) { + bodyLines.push( + `License expires on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${ + nxKey.perpetualNxVersion + } and below.` + ); + } else { + bodyLines.push( + `License expires on ${licenseExpiryDate.toLocaleDateString()}.` + ); + } } else { - bodyLines.push( - `License expires on ${licenseExpiryDate.toLocaleDateString()}.` - ); - } - } else { - if ('perpetualNxVersion' in powerpackLicense) { - bodyLines.push( - `License expired on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${ - powerpackLicense.perpetualNxVersion - } and below.` - ); - } else { - bodyLines.push( - `License expired on ${licenseExpiryDate.toLocaleDateString()}.` - ); + if ('perpetualNxVersion' in nxKey) { + bodyLines.push( + `License expired on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${ + nxKey.perpetualNxVersion + } and below.` + ); + } else { + bodyLines.push( + `License expired on ${licenseExpiryDate.toLocaleDateString()}.` + ); + } } } @@ -159,11 +154,11 @@ export async function reportHandler() { ); } bodyLines.push(''); - } else if (powerpackError) { + } else if (nxKeyError) { bodyLines.push(''); - bodyLines.push(chalk.red('Nx Powerpack')); + bodyLines.push(chalk.red('Nx key')); bodyLines.push(LINE_SEPARATOR); - bodyLines.push(powerpackError.message); + bodyLines.push(nxKeyError.message); bodyLines.push(''); } @@ -226,8 +221,8 @@ export async function reportHandler() { export interface ReportData { pm: PackageManager; pmVersion: string; - powerpackLicense: PowerpackLicense | null; - powerpackError: Error | null; + nxKey: NxKey | null; + nxKeyError: Error | null; powerpackPlugins: PackageJson[]; localPlugins: string[]; communityPlugins: PackageJson[]; @@ -276,20 +271,20 @@ export async function getReportData(): Promise { const native = isNativeAvailable(); - let powerpackLicense = null; - let powerpackError = null; + let nxKey = null; + let nxKeyError = null; try { - powerpackLicense = await getPowerpackLicenseInformation(); + nxKey = await getNxKeyInformation(); } catch (e) { - if (!(e instanceof NxPowerpackNotInstalledError)) { - powerpackError = e; + if (!(e instanceof NxKeyNotInstalledError)) { + nxKeyError = e; } } return { pm, - powerpackLicense, - powerpackError, + nxKey, + nxKeyError, powerpackPlugins, pmVersion, localPlugins, @@ -393,7 +388,9 @@ export function findMisalignedPackagesForPackage( export function findInstalledPowerpackPlugins(): PackageJson[] { const installedPlugins = findInstalledPlugins(); return installedPlugins.filter((dep) => - new RegExp('@nx/powerpack*').test(dep.name) + new RegExp( + '@nx/powerpack*|@nx/(.+)-cache|@nx/(conformance|owners|enterprise*)' + ).test(dep.name) ); } diff --git a/packages/nx/src/tasks-runner/cache.ts b/packages/nx/src/tasks-runner/cache.ts index e2000f6164..f96d78ec22 100644 --- a/packages/nx/src/tasks-runner/cache.ts +++ b/packages/nx/src/tasks-runner/cache.ts @@ -224,32 +224,40 @@ export class DbCache { } } else { return ( - (await this.getPowerpackS3Cache()) ?? - (await this.getPowerpackSharedCache()) ?? - (await this.getPowerpackGcsCache()) ?? - (await this.getPowerpackAzureCache()) ?? + (await this.getS3Cache()) ?? + (await this.getSharedCache()) ?? + (await this.getGcsCache()) ?? + (await this.getAzureCache()) ?? null ); } } - private getPowerpackS3Cache(): Promise { - return this.getPowerpackCache('@nx/powerpack-s3-cache'); + private async getS3Cache(): Promise { + const cache = await this.resolveRemoteCache('@nx/s3-cache'); + if (cache) return cache; + return this.resolveRemoteCache('@nx/powerpack-s3-cache'); } - private getPowerpackSharedCache(): Promise { - return this.getPowerpackCache('@nx/powerpack-shared-fs-cache'); + private async getSharedCache(): Promise { + const cache = await this.resolveRemoteCache('@nx/shared-fs-cache'); + if (cache) return cache; + return this.resolveRemoteCache('@nx/powerpack-shared-fs-cache'); } - private getPowerpackGcsCache(): Promise { - return this.getPowerpackCache('@nx/powerpack-gcs-cache'); + private async getGcsCache(): Promise { + const cache = await this.resolveRemoteCache('@nx/gcs-cache'); + if (cache) return cache; + return this.resolveRemoteCache('@nx/powerpack-gcs-cache'); } - private getPowerpackAzureCache(): Promise { - return this.getPowerpackCache('@nx/powerpack-azure-cache'); + private async getAzureCache(): Promise { + const cache = await this.resolveRemoteCache('@nx/azure-cache'); + if (cache) return cache; + return this.resolveRemoteCache('@nx/powerpack-azure-cache'); } - private async getPowerpackCache(pkg: string): Promise { + private async resolveRemoteCache(pkg: string): Promise { let getRemoteCache = null; try { getRemoteCache = (await import(this.resolvePackage(pkg))).getRemoteCache; diff --git a/packages/nx/src/tasks-runner/run-command.ts b/packages/nx/src/tasks-runner/run-command.ts index 17fe0287cb..ccf0b9fc7f 100644 --- a/packages/nx/src/tasks-runner/run-command.ts +++ b/packages/nx/src/tasks-runner/run-command.ts @@ -59,7 +59,7 @@ import { TasksRunner, TaskStatus } from './tasks-runner'; import { shouldStreamOutput } from './utils'; import chalk = require('chalk'); import type { Observable } from 'rxjs'; -import { printPowerpackLicense } from '../utils/powerpack'; +import { printNxKey } from '../utils/nx-key'; import { runPostTasksExecution, runPreTasksExecution, @@ -273,7 +273,7 @@ export async function runCommandForTasks( await renderIsDone; - await printPowerpackLicense(); + await printNxKey(); return taskResults; } diff --git a/packages/nx/src/utils/nx-key.ts b/packages/nx/src/utils/nx-key.ts new file mode 100644 index 0000000000..b7e29c5582 --- /dev/null +++ b/packages/nx/src/utils/nx-key.ts @@ -0,0 +1,64 @@ +import { logger } from './logger'; +import { getPackageManagerCommand } from './package-manager'; +import { workspaceRoot } from './workspace-root'; +import type { NxKey } from '@nx/key'; + +export function createNxKeyLicenseeInformation(nxKey: NxKey) { + if ('isPowerpack' in nxKey && nxKey.isPowerpack) { + return `Licensed to ${nxKey.organizationName} for ${nxKey.seatCount} user${ + nxKey.seatCount > 1 ? 's' : '' + } in ${ + nxKey.workspaceCount === 9999 + ? 'an unlimited number of' + : nxKey.workspaceCount + } workspace${nxKey.workspaceCount > 1 ? 's' : ''}.`; + } else { + return `Licensed to ${nxKey.organizationName}.`; + } +} + +export async function printNxKey() { + try { + const key = await getNxKeyInformation(); + if (key) { + logger.log(createNxKeyLicenseeInformation(key)); + } + } catch {} +} + +export async function getNxKeyInformation(): Promise { + try { + const { + getPowerpackLicenseInformation, + getPowerpackLicenseInformationAsync, + } = (await import( + '@nx/powerpack-license' + )) as typeof import('@nx/powerpack-license'); + return ( + getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation + )(workspaceRoot); + } catch (e) { + try { + const { getNxKeyInformationAsync } = (await import( + '@nx/key' + )) as typeof import('@nx/key'); + return getNxKeyInformationAsync(workspaceRoot); + } catch (e) { + if ('code' in e && e.code === 'MODULE_NOT_FOUND') { + throw new NxKeyNotInstalledError(e); + } + throw e; + } + } +} + +export class NxKeyNotInstalledError extends Error { + constructor(e: Error) { + super( + `The "@nx/key" package is needed to use Nx key enabled features. Please install it with ${ + getPackageManagerCommand().addDev + } @nx/key`, + { cause: e } + ); + } +} diff --git a/packages/nx/src/utils/powerpack.ts b/packages/nx/src/utils/powerpack.ts deleted file mode 100644 index 555ff6d67d..0000000000 --- a/packages/nx/src/utils/powerpack.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { logger } from './logger'; -import { getPackageManagerCommand } from './package-manager'; -import { workspaceRoot } from './workspace-root'; - -export async function printPowerpackLicense() { - try { - const { organizationName, seatCount, workspaceCount } = - await getPowerpackLicenseInformation(); - - logger.log( - `Nx Powerpack Licensed to ${organizationName} for ${seatCount} user${ - seatCount > 1 ? 's' : '' - } in ${ - workspaceCount === 9999 ? 'an unlimited number of' : workspaceCount - } workspace${workspaceCount > 1 ? 's' : ''}` - ); - } catch {} -} - -export async function getPowerpackLicenseInformation() { - try { - const { - getPowerpackLicenseInformation, - getPowerpackLicenseInformationAsync, - } = (await import( - '@nx/powerpack-license' - )) as typeof import('@nx/powerpack-license'); - return ( - getPowerpackLicenseInformationAsync ?? getPowerpackLicenseInformation - )(workspaceRoot); - } catch (e) { - if ('code' in e && e.code === 'MODULE_NOT_FOUND') { - throw new NxPowerpackNotInstalledError(e); - } - throw e; - } -} - -export class NxPowerpackNotInstalledError extends Error { - constructor(e: Error) { - super( - `The "@nx/powerpack-license" package is needed to use Nx Powerpack enabled features. Please install the @nx/powerpack-license with ${ - getPackageManagerCommand().addDev - } @nx/powerpack-license`, - { cause: e } - ); - } -} diff --git a/packages/nx/src/utils/require-nx-key.ts b/packages/nx/src/utils/require-nx-key.ts new file mode 100644 index 0000000000..1b332ae3c6 --- /dev/null +++ b/packages/nx/src/utils/require-nx-key.ts @@ -0,0 +1,22 @@ +import { execSync } from 'child_process'; +import { getPackageManagerCommand } from './package-manager'; + +export async function requireNxKey(): Promise { + // @ts-ignore + return import('@nx/key').catch(async (e) => { + if ('code' in e && e.code === 'MODULE_NOT_FOUND') { + try { + execSync(`${getPackageManagerCommand().addDev} @nx/key@latest`, { + windowsHide: false, + }); + + // @ts-ignore + return await import('@nx/key'); + } catch (e) { + throw new Error( + 'Failed to install @nx/key. Please install @nx/key and try again.' + ); + } + } + }); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2678cf2cf..2c700bedbe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -298,6 +298,9 @@ importers: '@nx/angular': specifier: 20.5.0-rc.4 version: 20.5.0-rc.4(6bzzb6mump3mw6fvztrlsbt2rq) + '@nx/conformance': + specifier: 1.3.0-beta.7 + version: 1.3.0-beta.7(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) '@nx/cypress': specifier: 20.5.0-rc.4 version: 20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(@zkochan/js-yaml@0.0.7)(cypress@13.13.0)(eslint@8.57.0)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)) @@ -319,6 +322,9 @@ importers: '@nx/js': specifier: 20.5.0-rc.4 version: 20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)) + '@nx/key': + specifier: 1.3.0-beta.7 + version: 1.3.0-beta.7 '@nx/next': specifier: 20.5.0-rc.4 version: 20.5.0-rc.4(mu5zuuqly2bukb6evtgvkjwtiu) @@ -326,14 +332,14 @@ importers: specifier: 20.5.0-rc.4 version: 20.5.0-rc.4(@babel/traverse@7.26.9)(@playwright/test@1.47.1)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(@zkochan/js-yaml@0.0.7)(eslint@8.57.0)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)) '@nx/powerpack-conformance': - specifier: 1.2.5 - version: 1.2.5(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) + specifier: 1.3.0-beta.7 + version: 1.3.0-beta.7(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) '@nx/powerpack-enterprise-cloud': - specifier: 1.2.5 - version: 1.2.5(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) + specifier: 1.3.0-beta.7 + version: 1.3.0-beta.7(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) '@nx/powerpack-license': - specifier: 1.2.5 - version: 1.2.5 + specifier: 1.3.0-beta.7 + version: 1.3.0-beta.7 '@nx/react': specifier: 20.5.0-rc.4 version: 20.5.0-rc.4(@babel/traverse@7.26.9)(@rspack/core@1.2.6(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.25.0)(eslint@8.57.0)(next@14.2.16(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.25.0)(webpack-cli@5.1.4)) @@ -5384,6 +5390,13 @@ packages: '@schematics/angular': '>= 17.0.0 < 20.0.0' rxjs: ^6.5.3 || ^7.5.0 + '@nx/conformance@1.3.0-beta.7': + resolution: {integrity: sha512-9yR1GxDkgI7tJDfNlBlCyuP9tBZ2xyB2K7g2+omN0UieSDTGaIdFbqI7pwlai4TAvfiSepV9cfXp+YPi9TrUkw==} + hasBin: true + peerDependencies: + '@nx/js': '>= 18 < 21' + nx: '>= 18 < 21' + '@nx/cypress@20.5.0-rc.4': resolution: {integrity: sha512-TvMRtYOvjBneF9CcWzjCrPj/z3KiCTMvZHOpRLSixCHwVb3CibFSrfOFtB+ERJMM1oXCbEQnJqut/zC4wLiDag==} peerDependencies: @@ -5402,6 +5415,11 @@ packages: peerDependencies: nx: '>= 19 <= 21' + '@nx/enterprise-cloud@1.3.0-beta.7': + resolution: {integrity: sha512-Eac3bCCA5dEA2PNemQzMERgdtZfs5u0fhjVuo/0tks3ttXsMjR4dAPb5FijUiJ/jfWmQ18rw+CgL5kbG3Go/Xw==} + peerDependencies: + nx: '>= 18 < 21' + '@nx/esbuild@20.5.0-rc.4': resolution: {integrity: sha512-S9pwMn63hS0woyW5JbCGRQVFpnJzTsLe6o5KGt53tOImRSCNhfdnfHUPHuowXYCuSdVv2Mm5+nlFtrGno0oaRQ==} peerDependencies: @@ -5448,6 +5466,64 @@ packages: verdaccio: optional: true + '@nx/key-darwin-arm64@1.3.0-beta.7': + resolution: {integrity: sha512-bLkowguWUdeZFlYhEuZLE5pKxRB7Vd9VZ+tCtmbYgq7Z3K3XQBwX9a43b14EFWyYJa7yhzgHVHmSYWKhGr42Hg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@nx/key-darwin-x64@1.3.0-beta.7': + resolution: {integrity: sha512-olow6csFnSBoBD9nVjIM/OqFWadPkY+x7jrHM5iRbk9qHQoOpCU5zxoNj7+vMYDLKT+k51qP5zL85IeY/dth5Q==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@nx/key-linux-arm-gnueabihf@1.3.0-beta.7': + resolution: {integrity: sha512-0DamaxdTQ3sMk0h1/2p0g4UFujOyTkFmFaMxXSezIShqFuiRnPxi4AZ/rh0XUvWhnJvKzovxMUh9GCNarD9wZg==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + + '@nx/key-linux-arm64-gnu@1.3.0-beta.7': + resolution: {integrity: sha512-jVr3ZKsY44kvXnKrBtFdxvnFh7j7Pi+EgYSp+xGgdxBAZSQTpYyRzsQ9XXPABCVsqwoNWuVu6weqtmw1SIw0QA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@nx/key-linux-arm64-musl@1.3.0-beta.7': + resolution: {integrity: sha512-QrYjVWm1/hm2ai5dgyogF7IeVue8TV3I/lfTj0/VytK/AeB+dtrTCYqc1p81y5EfjW6gwK2Y95zw6f5/jMfbFA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@nx/key-linux-x64-gnu@1.3.0-beta.7': + resolution: {integrity: sha512-xoWFPgYzuI2o86OSU+C3fpcTGLgFkvbJvYsHskN2Rff3Gy8y/YX4yV1zV3Zb24Uaot9yLzfMa6t3OANEZa1BNg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@nx/key-linux-x64-musl@1.3.0-beta.7': + resolution: {integrity: sha512-CuCPFG+FROuzaoWSI0LpUExIhOEJuW4XISehHhMmocQuVt6eUhAS4GAHJexuZM1/P9lajWan5Mw67iXOy8VoZA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@nx/key-win32-arm64-msvc@1.3.0-beta.7': + resolution: {integrity: sha512-3TBXD4Sgo8u4vcgNInAjZfngLoeTuz0RIfNnlUz/txYnC8O10mMouq/BRvpjPPhUel0XrJWo1MZUZwQCLyJVMA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + + '@nx/key-win32-x64-msvc@1.3.0-beta.7': + resolution: {integrity: sha512-c0yc2XMsRhH2ACVJKkLvd9mF0VD/HLDiYipnE8R1ZqQ+wD39FFmfng6746oAHhY7i829r9rT9KrXP97cW6vcZA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + + '@nx/key@1.3.0-beta.7': + resolution: {integrity: sha512-sv8+hFGezQr4WIRbdGRHM5F8N+5fObAr8rLdqFbVSWKNmslDwX16Ksgrqb73rTrSvOdctxh5Ml32dEQfsXmZUw==} + engines: {node: '>= 10'} + '@nx/module-federation@20.5.0-rc.4': resolution: {integrity: sha512-atkZr8AAaeohruKLRl2lbm00dKqy+5IvGZfpCTf1/OQDu5IDVtFrK1sjM7YZEt7FA8vXcJllm+e6bg9HQp7L4w==} peerDependencies: @@ -5526,74 +5602,15 @@ packages: '@playwright/test': optional: true - '@nx/powerpack-conformance@1.2.5': - resolution: {integrity: sha512-ns4ecJctMKGZlADCgfQmDV59UrzK+3TfhTrV+MW4l+pUn3PFVKGCbN9Xw1fDjv7a5c1TXKX6PaPu7iLhZKyagQ==} + '@nx/powerpack-conformance@1.3.0-beta.7': + resolution: {integrity: sha512-pzW6lYyCDiswVJXVmCfLLxlNZImBmC26fOOilnlHWE+mIKVPPYsrpbgKugoRRVmeGQL4k5I3B0GQNMIi/9h7SQ==} hasBin: true - peerDependencies: - '@nx/js': '>= 18 < 21' - nx: '>= 18 < 21' - '@nx/powerpack-enterprise-cloud@1.2.5': - resolution: {integrity: sha512-R/L4/9maurKMcrIcofuxCP2Gv9UoYUED+rVaQbHg1pgmekR7JCQYe5wbPKTMIUugVAWWUzhvLRq3+tetvHvjww==} - peerDependencies: - nx: '>= 18 < 21' + '@nx/powerpack-enterprise-cloud@1.3.0-beta.7': + resolution: {integrity: sha512-jYeI5UkiaSX9LkeQx1BGm4c//Q9DFMdEBmL9PfWlN/QFcFUAi5u81ieBTBbwQPb5z8jL58B7r3zhVlfxISqT4A==} - '@nx/powerpack-license-darwin-arm64@1.2.5': - resolution: {integrity: sha512-napAXiIPNVt9Na6AM74ngBppcg2VYEpZPna1y1bxXtV++BufXk+uJ5JfKiey3Z/TWi+mnJsfyxfiJH42T13Xmg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - - '@nx/powerpack-license-darwin-x64@1.2.5': - resolution: {integrity: sha512-EKIq0N0S+QJtgkX/rgI5BRqNqonfYsKQE3UUYbZjU4I2s21zaM4poCkLCjT4wLdW6v0DvitYx/URpyq0GCXVOw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - - '@nx/powerpack-license-linux-arm-gnueabihf@1.2.5': - resolution: {integrity: sha512-PRbqeqMm68QmelzGO89XsHIf+lVrAzQPu2yd92Y60XLGJqE/Z0hHV//B0lB0l0gtQyZU/IjbOD93VHp71bEM1A==} - engines: {node: '>= 10'} - cpu: [arm] - os: [linux] - - '@nx/powerpack-license-linux-arm64-gnu@1.2.5': - resolution: {integrity: sha512-Tc4sBymzjyOPj//me7ILjdupM8bZifjZyOn1i99NciQn1eDf7ibRzf8l15X39/KfYaYZlAnFKpyvWPcAC72ofw==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - - '@nx/powerpack-license-linux-arm64-musl@1.2.5': - resolution: {integrity: sha512-pSRd+nz7mC+2MfqmGEjz01IQUJH8J3KsnRx1MJP08qobRhjiNqvQqI42kLBu1ivaj14EhlAYxdmaREePnVOYKg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - - '@nx/powerpack-license-linux-x64-gnu@1.2.5': - resolution: {integrity: sha512-bLjB1QYS1f7Jm83xBjM2pcciMzhWK/T08+B/NbP++ifP9HkTAzvkygswHAUUKsGZbP3Q2nvia8r+CQGppJ5kqg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - - '@nx/powerpack-license-linux-x64-musl@1.2.5': - resolution: {integrity: sha512-DLN7xbZVQFW4CHXTJ+fFH+z4jOdsOX4FzhhfK8on3phezJj0HCDfl9/SHzYyvpvQyzrgyF07AeKcx6ffCrrFdw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - - '@nx/powerpack-license-win32-arm64-msvc@1.2.5': - resolution: {integrity: sha512-XO3djXr2Op8uBFs3i5I5ZJM3B/2wew/O+2JKaiGdkfCqziDMk6rBmKqDHKjQtQn8HqXHvDgBItwjo7AWyfiZBQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - - '@nx/powerpack-license-win32-x64-msvc@1.2.5': - resolution: {integrity: sha512-DKM7giepoqoy1TXuB21pAqolLlW6KKY1NRyr9sf4a0LnUtFbba/Se4lrAUVa/xbVJgyOziz2CICkSBGWYp29jw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - - '@nx/powerpack-license@1.2.5': - resolution: {integrity: sha512-Hqq+ynF76+CQ1HrezEKXAxoByWCnY1W9aSF245zjr/f2gzJj+/U/LAU0mgxGBqm0ZJ9ozxtPCD/CHrah9LqIsw==} + '@nx/powerpack-license@1.3.0-beta.7': + resolution: {integrity: sha512-DhCYshuEogCQuA0YjPs/VDr4dtePqM7EUYFpH+2aQPjdaafaMiNbxiQZp2aPQ/g5oaQD8at8wYqKeLfOtbgmAA==} engines: {node: '>= 10'} '@nx/react@20.5.0-rc.4': @@ -8682,6 +8699,11 @@ packages: resolution: {integrity: sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==} engines: {node: '>=4'} + axios-retry@4.5.0: + resolution: {integrity: sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==} + peerDependencies: + axios: 0.x || 1.x + axios@1.7.7: resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==} @@ -10331,6 +10353,10 @@ packages: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} engines: {node: '>=8.6'} + enquirer@2.4.1: + resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} + engines: {node: '>=8.6'} + entities@2.2.0: resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} @@ -12090,6 +12116,10 @@ packages: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} + is-retry-allowed@2.2.0: + resolution: {integrity: sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==} + engines: {node: '>=10'} + is-set@2.0.3: resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==} engines: {node: '>= 0.4'} @@ -23459,6 +23489,20 @@ snapshots: - vue-tsc - webpack-cli + '@nx/conformance@1.3.0-beta.7(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))': + dependencies: + '@nx/devkit': 20.2.2(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) + '@nx/js': 20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)) + '@nx/key': 1.3.0-beta.7 + ajv: 8.17.1 + esbuild: 0.21.5 + nx: 20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)) + picocolors: 1.1.1 + semver: 7.5.4 + yargs: 17.7.2 + transitivePeerDependencies: + - debug + '@nx/cypress@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(@zkochan/js-yaml@0.0.7)(cypress@13.13.0)(eslint@8.57.0)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))': dependencies: '@nx/devkit': 20.5.0-rc.4(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) @@ -23507,6 +23551,15 @@ snapshots: tslib: 2.8.1 yargs-parser: 21.1.1 + '@nx/enterprise-cloud@1.3.0-beta.7(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))': + dependencies: + '@nx/devkit': 20.2.2(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) + '@nx/key': 1.3.0-beta.7 + nx: 20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)) + semver: 7.5.4 + transitivePeerDependencies: + - debug + '@nx/esbuild@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(esbuild@0.25.0)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))': dependencies: '@nx/devkit': 20.5.0-rc.4(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) @@ -23664,6 +23717,54 @@ snapshots: - supports-color - typescript + '@nx/key-darwin-arm64@1.3.0-beta.7': + optional: true + + '@nx/key-darwin-x64@1.3.0-beta.7': + optional: true + + '@nx/key-linux-arm-gnueabihf@1.3.0-beta.7': + optional: true + + '@nx/key-linux-arm64-gnu@1.3.0-beta.7': + optional: true + + '@nx/key-linux-arm64-musl@1.3.0-beta.7': + optional: true + + '@nx/key-linux-x64-gnu@1.3.0-beta.7': + optional: true + + '@nx/key-linux-x64-musl@1.3.0-beta.7': + optional: true + + '@nx/key-win32-arm64-msvc@1.3.0-beta.7': + optional: true + + '@nx/key-win32-x64-msvc@1.3.0-beta.7': + optional: true + + '@nx/key@1.3.0-beta.7': + dependencies: + '@napi-rs/wasm-runtime': 0.2.4 + axios: 1.7.7 + axios-retry: 4.5.0(axios@1.7.7) + chalk: 4.1.2 + enquirer: 2.4.1 + ora: 5.4.1 + optionalDependencies: + '@nx/key-darwin-arm64': 1.3.0-beta.7 + '@nx/key-darwin-x64': 1.3.0-beta.7 + '@nx/key-linux-arm-gnueabihf': 1.3.0-beta.7 + '@nx/key-linux-arm64-gnu': 1.3.0-beta.7 + '@nx/key-linux-arm64-musl': 1.3.0-beta.7 + '@nx/key-linux-x64-gnu': 1.3.0-beta.7 + '@nx/key-linux-x64-musl': 1.3.0-beta.7 + '@nx/key-win32-arm64-msvc': 1.3.0-beta.7 + '@nx/key-win32-x64-msvc': 1.3.0-beta.7 + transitivePeerDependencies: + - debug + '@nx/module-federation@20.5.0-rc.4(@babel/traverse@7.26.9)(@rspack/core@1.2.6(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(bufferutil@4.0.7)(esbuild@0.25.0)(next@14.2.16(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))': dependencies: '@module-federation/enhanced': 0.9.1(@rspack/core@1.2.6(@swc/helpers@0.5.11))(bufferutil@4.0.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.25.0)(webpack-cli@5.1.4)) @@ -23804,65 +23905,26 @@ snapshots: - typescript - verdaccio - '@nx/powerpack-conformance@1.2.5(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))': + '@nx/powerpack-conformance@1.3.0-beta.7(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))': dependencies: - '@nx/devkit': 20.2.2(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) - '@nx/js': 20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)) - '@nx/powerpack-license': 1.2.5 - ajv: 8.17.1 - esbuild: 0.21.5 - nx: 20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)) - picocolors: 1.1.1 - semver: 7.5.4 - yargs: 17.7.2 + '@nx/conformance': 1.3.0-beta.7(@nx/js@20.5.0-rc.4(@babel/traverse@7.26.9)(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0)))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) + transitivePeerDependencies: + - '@nx/js' + - debug + - nx - '@nx/powerpack-enterprise-cloud@1.2.5(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))': + '@nx/powerpack-enterprise-cloud@1.3.0-beta.7(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))': dependencies: - '@nx/devkit': 20.2.2(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) - '@nx/powerpack-license': 1.2.5 - nx: 20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)) - semver: 7.5.4 + '@nx/enterprise-cloud': 1.3.0-beta.7(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))) + transitivePeerDependencies: + - debug + - nx - '@nx/powerpack-license-darwin-arm64@1.2.5': - optional: true - - '@nx/powerpack-license-darwin-x64@1.2.5': - optional: true - - '@nx/powerpack-license-linux-arm-gnueabihf@1.2.5': - optional: true - - '@nx/powerpack-license-linux-arm64-gnu@1.2.5': - optional: true - - '@nx/powerpack-license-linux-arm64-musl@1.2.5': - optional: true - - '@nx/powerpack-license-linux-x64-gnu@1.2.5': - optional: true - - '@nx/powerpack-license-linux-x64-musl@1.2.5': - optional: true - - '@nx/powerpack-license-win32-arm64-msvc@1.2.5': - optional: true - - '@nx/powerpack-license-win32-x64-msvc@1.2.5': - optional: true - - '@nx/powerpack-license@1.2.5': + '@nx/powerpack-license@1.3.0-beta.7': dependencies: - '@napi-rs/wasm-runtime': 0.2.4 - optionalDependencies: - '@nx/powerpack-license-darwin-arm64': 1.2.5 - '@nx/powerpack-license-darwin-x64': 1.2.5 - '@nx/powerpack-license-linux-arm-gnueabihf': 1.2.5 - '@nx/powerpack-license-linux-arm64-gnu': 1.2.5 - '@nx/powerpack-license-linux-arm64-musl': 1.2.5 - '@nx/powerpack-license-linux-x64-gnu': 1.2.5 - '@nx/powerpack-license-linux-x64-musl': 1.2.5 - '@nx/powerpack-license-win32-arm64-msvc': 1.2.5 - '@nx/powerpack-license-win32-x64-msvc': 1.2.5 + '@nx/key': 1.3.0-beta.7 + transitivePeerDependencies: + - debug '@nx/react@20.5.0-rc.4(@babel/traverse@7.26.9)(@rspack/core@1.2.6(@swc/helpers@0.5.11))(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11))(@types/node@20.16.10)(@zkochan/js-yaml@0.0.7)(bufferutil@4.0.7)(esbuild@0.25.0)(eslint@8.57.0)(next@14.2.16(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(@playwright/test@1.47.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.55.0))(nx@20.5.0-rc.4(@swc-node/register@1.9.1(@swc/core@1.5.7(@swc/helpers@0.5.11))(@swc/types@0.1.12)(typescript@5.7.3))(@swc/core@1.5.7(@swc/helpers@0.5.11)))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.7.3)(verdaccio@6.0.5(encoding@0.1.13)(typanion@3.14.0))(webpack-cli@5.1.4(webpack-dev-server@5.0.4)(webpack@5.88.0))(webpack@5.88.0(@swc/core@1.5.7(@swc/helpers@0.5.11))(esbuild@0.25.0)(webpack-cli@5.1.4))': dependencies: @@ -27872,6 +27934,11 @@ snapshots: axe-core@4.10.0: {} + axios-retry@4.5.0(axios@1.7.7): + dependencies: + axios: 1.7.7 + is-retry-allowed: 2.2.0 + axios@1.7.7: dependencies: follow-redirects: 1.15.9(debug@4.3.7) @@ -29793,6 +29860,11 @@ snapshots: dependencies: ansi-colors: 4.1.3 + enquirer@2.4.1: + dependencies: + ansi-colors: 4.1.3 + strip-ansi: 6.0.1 + entities@2.2.0: {} entities@4.5.0: {} @@ -32173,6 +32245,8 @@ snapshots: call-bind: 1.0.7 has-tostringtag: 1.0.2 + is-retry-allowed@2.2.0: {} + is-set@2.0.3: {} is-shared-array-buffer@1.0.3: diff --git a/scripts/patched-jest-resolver.js b/scripts/patched-jest-resolver.js index 0116facee7..2b38df09b0 100644 --- a/scripts/patched-jest-resolver.js +++ b/scripts/patched-jest-resolver.js @@ -62,9 +62,24 @@ module.exports = function (path, options) { return require.resolve('identity-obj-proxy'); } // Try to use the defaultResolver + + const excludedPackages = [ + '@nx/conformance', + '@nx/owners', + '@nx/key', + '@nx/s3-cache', + '@nx/azure-cache', + '@nx/gcs-cache', + '@nx/shared-fs-cache', + ]; + try { // powerpack packages are installed via npm and resolved like any other packages - if (path.startsWith('@nx/') && !path.startsWith('@nx/powerpack-')) { + if ( + path.startsWith('@nx/') && + !path.startsWith('@nx/powerpack-') && + !excludedPackages.some((pkg) => path.startsWith(pkg)) + ) { throw new Error('custom resolution'); } if (path.startsWith('nx/')) throw new Error('custom resolution');