@nx/devkit 23.2.0-pr.36527.2252709 → 23.2.0-pr.36866.449f6f3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/internal.d.ts +4 -2
- package/dist/internal.js +26 -4
- package/dist/ngcli-adapter.js +1 -1
- package/dist/src/generators/e2e-web-server-info-utils.d.ts +6 -0
- package/dist/src/generators/e2e-web-server-info-utils.js +8 -4
- package/dist/src/generators/plugin-migrations/batch-conversion-finalize.d.ts +19 -0
- package/dist/src/generators/plugin-migrations/batch-conversion-finalize.js +658 -0
- package/dist/src/generators/plugin-migrations/batch-conversion-session.d.ts +131 -0
- package/dist/src/generators/plugin-migrations/batch-conversion-session.js +141 -0
- package/dist/src/generators/plugin-migrations/conversion-warnings.d.ts +28 -0
- package/dist/src/generators/plugin-migrations/conversion-warnings.js +72 -0
- package/dist/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts +250 -1
- package/dist/src/generators/plugin-migrations/executor-to-plugin-migrator.js +1594 -227
- package/dist/src/generators/target-defaults-utils.d.ts +8 -0
- package/dist/src/generators/target-defaults-utils.js +17 -5
- package/dist/src/utils/config-utils.d.ts +3 -0
- package/dist/src/utils/config-utils.js +197 -27
- package/dist/src/utils/package-json.js +1 -1
- package/dist/src/utils/semver.js +1 -1
- package/dist/testing.js +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
|
|
8
8
|
<div style="text-align: center;">
|
|
9
9
|
|
|
10
|
-
[]()
|
|
10
|
+
[](<>)
|
|
11
11
|
[](https://www.npmjs.com/package/nx)
|
|
12
|
-
[]()
|
|
12
|
+
[](<>)
|
|
13
13
|
[](http://commitizen.github.io/cz-cli/)
|
|
14
14
|
[](https://go.nx.dev/community)
|
|
15
15
|
[](https://nx.dev/docs/features/ci-features/sandboxing)
|
package/dist/internal.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
export { signalToCode, createProjectRootMappingsFromProjectConfigurations, PluginCache, safeWriteFileCache, emitPluginWorkerLog, resolveImplementation, resolveSchema, ImplementationResolutionError, SchemaResolutionError, resolvePrompt, PromptResolutionError, acknowledgeBuildScripts, getCatalogManager, } from 'nx/src/devkit-internals';
|
|
1
|
+
export { signalToCode, createProjectRootMappingsFromProjectConfigurations, PluginCache, safeWriteFileCache, emitPluginWorkerLog, resolveImplementation, resolveSchema, ImplementationResolutionError, SchemaResolutionError, resolvePrompt, PromptResolutionError, acknowledgeBuildScripts, getCatalogManager, getDaemonClientEnvGeneration, getAppliedDaemonClientEnv, applyDaemonEnvFromClient, getGraphTimeDotEnvForTask, hashDaemonClientEnv, } from 'nx/src/devkit-internals';
|
|
2
2
|
export { detectFormatterInTree, prettierConfigFiles, oxfmtConfigFiles, } from 'nx/src/devkit-internals';
|
|
3
3
|
export type { FormatterType } from 'nx/src/devkit-internals';
|
|
4
4
|
export { determineArtifactNameAndDirectoryOptions, getRelativeCwd, type FileExtensionType, } from './src/generators/artifact-name-and-directory-utils';
|
|
5
5
|
export { getE2EWebServerInfo, type E2EWebServerDetails, } from './src/generators/e2e-web-server-info-utils';
|
|
6
6
|
export { forEachExecutorOptions } from './src/generators/executor-options-utils';
|
|
7
7
|
export { AggregatedLog } from './src/generators/plugin-migrations/aggregate-log-util';
|
|
8
|
+
export { finalizeBatchConversion } from './src/generators/plugin-migrations/batch-conversion-finalize';
|
|
9
|
+
export { openBatchConversionSession, type BatchConversionSession, } from './src/generators/plugin-migrations/batch-conversion-session';
|
|
8
10
|
export { migrateProjectExecutorsToPlugin, migrateProjectExecutorsToPluginV1, NoTargetsToMigrateError, type InferredTargetConfiguration, } from './src/generators/plugin-migrations/executor-to-plugin-migrator';
|
|
9
11
|
export { processTargetOutputs, deleteMatchingProperties, toProjectRelativePath, } from './src/generators/plugin-migrations/plugin-migration-utils';
|
|
10
12
|
export { determineProjectNameAndRootOptions, ensureRootProjectName, resolveImportPath, } from './src/generators/project-name-and-root-utils';
|
|
@@ -22,5 +24,5 @@ export { logShowProjectCommand } from './src/utils/log-show-project-command';
|
|
|
22
24
|
export { eachValueFrom } from './src/utils/rxjs-for-await';
|
|
23
25
|
export { checkAndCleanWithSemver } from './src/utils/semver';
|
|
24
26
|
export { camelize, capitalize, classify, dasherize, } from './src/utils/string-utils';
|
|
25
|
-
export { runCommandsExecutor, type TaskResult, type Agent, type BatchExecutorTaskResult, BatchFunctionRunner, type BatchResults, type CLIErrorMessageConfig, type CLINoteMessageConfig, type CLISuccessMessageConfig, type CLIWarnMessageConfig, Cache, type CachedResult, type Change, type ChangedFile, CompositeLifeCycle, DeletedFileChange, type DependsOnEntryLocation, confirmationPrompt, type FileChange, type FileDataDependency, type FileMapCache, type FinalConfigForProject, FsTree, type GeneratorInformation, type InputDefinition, type JsonInput, LARGE_BUFFER, type LifeCycle, LockFileChange, NX_PREFIX, type NormalizedTargetDependencyConfig, type NxCloudOnBoardingStatus, type NxReleaseVersionConfiguration, type PackageJson, type PackageJsonDependencySection, type PackageManagerCommands, type ProjectRootMappings, RemoteCacheV2, type RunCommandsOptions, SyncError, type SyncGeneratorResult, TEN_MEGABYTES, TargetProjectLocator, type TaskMetadata, type TaskStatus, type TaskWithCachedResult, type TasksRunner, type UnregisterCallback, WholeFileChange, buildPackageJsonPatterns, buildPackageJsonWorkspacesMatcher, buildProjectGraphAndSourceMapsWithoutDaemon, calculateFileChanges, calculateReverseDeps, codeFrameColumns, combineGlobPatterns, connectToNxCloud, createDirectory, createLockFile, createNxCloudOnboardingURL, createNxCloudOnboardingURLForWelcomeApp, createPackageJson, createProjectGraphAndSourceMapsAsync, createProjectRootMappings, createRunManyDynamicOutputRenderer, createTaskId, daemonClient, deduceDefaultBase, defaultFileRead, deriveGroupNameFromTarget, directoryExists, expandDependencyConfigSyntaxSugar, expandInitiatingTasksThroughNoop, expandWildcardTargetConfiguration, fileDataDepTarget, fileDataDepType, fileExists, filterUsingGlobPatterns, findAllProjectNodeDependencies, findInstalledPlugins, findMatchingConfigFiles, findMatchingProjects, findProjectForPath, findProjectsNpmDependencies, forceRegisterEsmLoader, getCliPath, getCustomHasher, getDependencyConfigs, getExecutorForTask, getExecutorInformation, getExecutorNameForTask, getFilesInDirectoryUsingContext, getGeneratorInformation, getGlobPatternsFromPackageManagerWorkspaces, getLastValueFromAsyncIterableIterator, getLatestCommitSha, getLockFileName, getNxCloudAppOnBoardingUrl, getNxCloudUrl, getNxRequirePaths, getOutputs, getPrintableCommandArgsForTask, getRelativeProjectJsonSchemaPath, getSerializedArgsForTask, getSourceDirOfDependentProjects, getTargetConfigurationForTask, getTargetInputs, getUnparsedOverrideArgs, getWorkspacePackagesFromGraph, globWithWorkspaceContext, handleImport, handleProjectGraphError, hashFile, hashObject, hashWithWorkspaceContext, interpolate, isBuiltinModuleImport, isCI, isCacheableTask, isDeletedFileChange, isLockFileChange, isNpmProject, isNxCloudUsed, isProjectGraphExternalNode, isProjectGraphProjectNode, isRelativePath, isWholeFileChange, killProcessTreeGraceful, loadTsFile, mergeTargetConfigurations, multiselectPrompt, normalizeDependencyConfigDefinition, normalizeDependencyConfigProjects, normalizeTargetDependencyWithStringProjects, nxVersion, orange, parseExecutor, preventRecursionInGraphConstruction, readCachedProjectConfiguration, readFileIfExisting, readFileMapCache, readModulePackageJson, readNxJsonFromDisk, readNxMigrateConfig, readPackageJson, readProjectAndTargetFromTargetString, registerTsConfigPaths, registerTsProject, removeTasksFromTaskGraph, requireWithTsconfigFallback, resetWorkspaceContext, runNxSync, safeExecFileSync, safeSpawn, selectPrompt, setWorkspaceRoot, setupAiAgentsGenerator, setupWorkspaceContext, shouldStreamOutput, toNewFormat, toOldFormat, transformLegacyOutputs, textPrompt, unparse, validateOutputs, workspaceDataDirectory, workspaceRootInner, } from 'nx/src/devkit-internals';
|
|
27
|
+
export { runCommandsExecutor, type TaskResult, type Agent, type BatchExecutorTaskResult, BatchFunctionRunner, type BatchResults, type CLIErrorMessageConfig, type CLINoteMessageConfig, type CLISuccessMessageConfig, type CLIWarnMessageConfig, Cache, type CachedResult, type Change, type ChangedFile, CompositeLifeCycle, DeletedFileChange, type DependsOnEntryLocation, confirmationPrompt, type FileChange, type FileDataDependency, type FileMapCache, type FinalConfigForProject, FsTree, type GeneratorInformation, type InputDefinition, type JsonInput, LARGE_BUFFER, type LifeCycle, LockFileChange, NX_PREFIX, type NormalizedTargetDependencyConfig, type NxCloudOnBoardingStatus, type NxReleaseVersionConfiguration, type PackageJson, type PackageJsonDependencySection, type PackageManagerCommands, type ProjectRootMappings, RemoteCacheV2, type RunCommandsOptions, SyncError, type SyncGeneratorResult, TEN_MEGABYTES, TargetProjectLocator, type TaskMetadata, type TaskStatus, type TaskWithCachedResult, type TasksRunner, type UnregisterCallback, WholeFileChange, buildPackageJsonPatterns, buildPackageJsonWorkspacesMatcher, buildProjectGraphAndSourceMapsWithoutDaemon, calculateFileChanges, calculateReverseDeps, codeFrameColumns, combineGlobPatterns, connectToNxCloud, createDirectory, createLockFile, createNxCloudOnboardingURL, createNxCloudOnboardingURLForWelcomeApp, createPackageJson, createProjectGraphAndSourceMapsAsync, createProjectRootMappings, createRunManyDynamicOutputRenderer, createTargetDefaultsResults, createTaskId, daemonClient, deduceDefaultBase, defaultFileRead, deriveGroupNameFromTarget, directoryExists, dropEmptyPeerDependencySections, expandDependencyConfigSyntaxSugar, expandInitiatingTasksThroughNoop, expandWildcardTargetConfiguration, fileDataDepTarget, fileDataDepType, fileExists, filterUsingGlobPatterns, findAllProjectNodeDependencies, findInstalledPlugins, findMatchingConfigFiles, findMatchingProjects, findMatchingTargetNames, findProjectForPath, findProjectsNpmDependencies, forceRegisterEsmLoader, generatePrunedDeployOutput, getCliPath, getCustomHasher, getDependencyConfigs, getEnvFilesForTask, getEnvPathsForTask, getExecutorForTask, getExecutorInformation, getExecutorNameForTask, getFilesInDirectoryUsingContext, getGeneratorInformation, getGlobPatternsFromPackageManagerWorkspaces, getLastValueFromAsyncIterableIterator, getLatestCommitSha, getLockFileName, getNxCloudAppOnBoardingUrl, getNxCloudUrl, getNxRequirePaths, getOutputs, getPrintableCommandArgsForTask, getRelativeProjectJsonSchemaPath, getSerializedArgsForTask, getSourceDirOfDependentProjects, getTargetConfigurationForTask, getTargetInputs, getUnparsedOverrideArgs, getWorkspacePackagesFromGraph, globWithWorkspaceContext, handleImport, handleProjectGraphError, hashFile, hashObject, hashWithWorkspaceContext, interpolate, isBuiltinModuleImport, isCI, isCacheableTask, isDeletedFileChange, isLockFileChange, isNpmProject, isNxCloudUsed, isProjectGraphExternalNode, isProjectGraphProjectNode, isRelativePath, isWholeFileChange, killChildOnHostExit, killProcessTreeGraceful, loadTsFile, mergeTargetConfigurations, movePeerDependencyToDependencies, multiselectPrompt, normalizeDependencyConfigDefinition, normalizeDependencyConfigProjects, normalizeTargetDependencyWithStringProjects, nxVersion, orange, parseExecutor, parseVersionFromPackageManagerField, preventRecursionInGraphConstruction, readCachedProjectConfiguration, readFileIfExisting, readFileMapCache, readModulePackageJson, readNxJsonFromDisk, readNxMigrateConfig, readPackageJson, readProjectAndTargetFromTargetString, registerTsConfigPaths, registerTsProject, relocatePrunedLocalPathSpec, removeTasksFromTaskGraph, requireWithTsconfigFallback, resetWorkspaceContext, resolveCommandSyntacticSugar, runNxSync, safeExecFileSync, safeSpawn, selectPrompt, setWorkspaceRoot, setupAiAgentsGenerator, setupWorkspaceContext, shouldStreamOutput, toNewFormat, toOldFormat, transformLegacyOutputs, textPrompt, unparse, validateOutputs, warnUnshippableLocalPathSpec, workspaceDataDirectory, workspaceRootInner, } from 'nx/src/devkit-internals';
|
|
26
28
|
export type { AfterAllProjectsVersioned } from 'nx/release';
|
package/dist/internal.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.
|
|
6
|
-
exports.
|
|
3
|
+
exports.createAsyncIterable = exports.assertSupportedPackageVersion = exports.assertSupportedInstalledPackageVersion = exports.getInstalledPackageVersion = exports.getDeclaredPackageVersion = exports.addPlugin = exports.upsertTargetDefault = exports.updateTargetDefault = exports.readTargetDefaultsForTarget = exports.findTargetDefault = exports.addE2eCiTargetDefaults = exports.addBuildTargetDefaults = exports.isInteractive = exports.resolveImportPath = exports.ensureRootProjectName = exports.determineProjectNameAndRootOptions = exports.toProjectRelativePath = exports.deleteMatchingProperties = exports.processTargetOutputs = exports.NoTargetsToMigrateError = exports.migrateProjectExecutorsToPluginV1 = exports.migrateProjectExecutorsToPlugin = exports.openBatchConversionSession = exports.finalizeBatchConversion = exports.AggregatedLog = exports.forEachExecutorOptions = exports.getE2EWebServerInfo = exports.getRelativeCwd = exports.determineArtifactNameAndDirectoryOptions = exports.oxfmtConfigFiles = exports.prettierConfigFiles = exports.detectFormatterInTree = exports.hashDaemonClientEnv = exports.getGraphTimeDotEnvForTask = exports.applyDaemonEnvFromClient = exports.getAppliedDaemonClientEnv = exports.getDaemonClientEnvGeneration = exports.getCatalogManager = exports.acknowledgeBuildScripts = exports.PromptResolutionError = exports.resolvePrompt = exports.SchemaResolutionError = exports.ImplementationResolutionError = exports.resolveSchema = exports.resolveImplementation = exports.emitPluginWorkerLog = exports.safeWriteFileCache = exports.PluginCache = exports.createProjectRootMappingsFromProjectConfigurations = exports.signalToCode = void 0;
|
|
4
|
+
exports.deduceDefaultBase = exports.daemonClient = exports.createTaskId = exports.createTargetDefaultsResults = exports.createRunManyDynamicOutputRenderer = exports.createProjectRootMappings = exports.createProjectGraphAndSourceMapsAsync = exports.createPackageJson = exports.createNxCloudOnboardingURLForWelcomeApp = exports.createNxCloudOnboardingURL = exports.createLockFile = exports.createDirectory = exports.connectToNxCloud = exports.combineGlobPatterns = exports.codeFrameColumns = exports.calculateReverseDeps = exports.calculateFileChanges = exports.buildProjectGraphAndSourceMapsWithoutDaemon = exports.buildPackageJsonWorkspacesMatcher = exports.buildPackageJsonPatterns = exports.WholeFileChange = exports.TargetProjectLocator = exports.TEN_MEGABYTES = exports.SyncError = exports.RemoteCacheV2 = exports.NX_PREFIX = exports.LockFileChange = exports.LARGE_BUFFER = exports.FsTree = exports.confirmationPrompt = exports.DeletedFileChange = exports.CompositeLifeCycle = exports.Cache = exports.BatchFunctionRunner = exports.runCommandsExecutor = exports.dasherize = exports.classify = exports.capitalize = exports.camelize = exports.checkAndCleanWithSemver = exports.eachValueFrom = exports.logShowProjectCommand = exports.getNamedInputs = exports.findPluginForConfigFile = exports.clearRequireCache = exports.loadConfigFile = exports.calculateHashesForCreateNodes = exports.calculateHashForCreateNodes = exports.mapAsyncIterable = exports.combineAsyncIterables = void 0;
|
|
5
|
+
exports.hashFile = exports.handleProjectGraphError = exports.handleImport = exports.globWithWorkspaceContext = exports.getWorkspacePackagesFromGraph = exports.getUnparsedOverrideArgs = exports.getTargetInputs = exports.getTargetConfigurationForTask = exports.getSourceDirOfDependentProjects = exports.getSerializedArgsForTask = exports.getRelativeProjectJsonSchemaPath = exports.getPrintableCommandArgsForTask = exports.getOutputs = exports.getNxRequirePaths = exports.getNxCloudUrl = exports.getNxCloudAppOnBoardingUrl = exports.getLockFileName = exports.getLatestCommitSha = exports.getLastValueFromAsyncIterableIterator = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGeneratorInformation = exports.getFilesInDirectoryUsingContext = exports.getExecutorNameForTask = exports.getExecutorInformation = exports.getExecutorForTask = exports.getEnvPathsForTask = exports.getEnvFilesForTask = exports.getDependencyConfigs = exports.getCustomHasher = exports.getCliPath = exports.generatePrunedDeployOutput = exports.forceRegisterEsmLoader = exports.findProjectsNpmDependencies = exports.findProjectForPath = exports.findMatchingTargetNames = exports.findMatchingProjects = exports.findMatchingConfigFiles = exports.findInstalledPlugins = exports.findAllProjectNodeDependencies = exports.filterUsingGlobPatterns = exports.fileExists = exports.fileDataDepType = exports.fileDataDepTarget = exports.expandWildcardTargetConfiguration = exports.expandInitiatingTasksThroughNoop = exports.expandDependencyConfigSyntaxSugar = exports.dropEmptyPeerDependencySections = exports.directoryExists = exports.deriveGroupNameFromTarget = exports.defaultFileRead = void 0;
|
|
6
|
+
exports.setupWorkspaceContext = exports.setupAiAgentsGenerator = exports.setWorkspaceRoot = exports.selectPrompt = exports.safeSpawn = exports.safeExecFileSync = exports.runNxSync = exports.resolveCommandSyntacticSugar = exports.resetWorkspaceContext = exports.requireWithTsconfigFallback = exports.removeTasksFromTaskGraph = exports.relocatePrunedLocalPathSpec = exports.registerTsProject = exports.registerTsConfigPaths = exports.readProjectAndTargetFromTargetString = exports.readPackageJson = exports.readNxMigrateConfig = exports.readNxJsonFromDisk = exports.readModulePackageJson = exports.readFileMapCache = exports.readFileIfExisting = exports.readCachedProjectConfiguration = exports.preventRecursionInGraphConstruction = exports.parseVersionFromPackageManagerField = exports.parseExecutor = exports.orange = exports.nxVersion = exports.normalizeTargetDependencyWithStringProjects = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.multiselectPrompt = exports.movePeerDependencyToDependencies = exports.mergeTargetConfigurations = exports.loadTsFile = exports.killProcessTreeGraceful = exports.killChildOnHostExit = exports.isWholeFileChange = exports.isRelativePath = exports.isProjectGraphProjectNode = exports.isProjectGraphExternalNode = exports.isNxCloudUsed = exports.isNpmProject = exports.isLockFileChange = exports.isDeletedFileChange = exports.isCacheableTask = exports.isCI = exports.isBuiltinModuleImport = exports.interpolate = exports.hashWithWorkspaceContext = exports.hashObject = void 0;
|
|
7
|
+
exports.workspaceRootInner = exports.workspaceDataDirectory = exports.warnUnshippableLocalPathSpec = exports.validateOutputs = exports.unparse = exports.textPrompt = exports.transformLegacyOutputs = exports.toOldFormat = exports.toNewFormat = exports.shouldStreamOutput = void 0;
|
|
7
8
|
var devkit_internals_1 = require("nx/src/devkit-internals");
|
|
8
9
|
Object.defineProperty(exports, "signalToCode", { enumerable: true, get: function () { return devkit_internals_1.signalToCode; } });
|
|
9
10
|
Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return devkit_internals_1.createProjectRootMappingsFromProjectConfigurations; } });
|
|
@@ -23,6 +24,11 @@ Object.defineProperty(exports, "acknowledgeBuildScripts", { enumerable: true, ge
|
|
|
23
24
|
// ship to external plugins under the +/- 1 tolerance, so they must keep
|
|
24
25
|
// importing nx/src/utils/catalog directly. See packages/devkit/CLAUDE.md.
|
|
25
26
|
Object.defineProperty(exports, "getCatalogManager", { enumerable: true, get: function () { return devkit_internals_1.getCatalogManager; } });
|
|
27
|
+
Object.defineProperty(exports, "getDaemonClientEnvGeneration", { enumerable: true, get: function () { return devkit_internals_1.getDaemonClientEnvGeneration; } });
|
|
28
|
+
Object.defineProperty(exports, "getAppliedDaemonClientEnv", { enumerable: true, get: function () { return devkit_internals_1.getAppliedDaemonClientEnv; } });
|
|
29
|
+
Object.defineProperty(exports, "applyDaemonEnvFromClient", { enumerable: true, get: function () { return devkit_internals_1.applyDaemonEnvFromClient; } });
|
|
30
|
+
Object.defineProperty(exports, "getGraphTimeDotEnvForTask", { enumerable: true, get: function () { return devkit_internals_1.getGraphTimeDotEnvForTask; } });
|
|
31
|
+
Object.defineProperty(exports, "hashDaemonClientEnv", { enumerable: true, get: function () { return devkit_internals_1.hashDaemonClientEnv; } });
|
|
26
32
|
// Formatter detection and setup. `@nx/js` needs these to write and detect a
|
|
27
33
|
// workspace's formatter config, and it depends on `@nx/devkit` rather than on
|
|
28
34
|
// `nx`, so this is its declared route to them. Against an older nx they arrive
|
|
@@ -43,6 +49,10 @@ var executor_options_utils_1 = require("./src/generators/executor-options-utils"
|
|
|
43
49
|
Object.defineProperty(exports, "forEachExecutorOptions", { enumerable: true, get: function () { return executor_options_utils_1.forEachExecutorOptions; } });
|
|
44
50
|
var aggregate_log_util_1 = require("./src/generators/plugin-migrations/aggregate-log-util");
|
|
45
51
|
Object.defineProperty(exports, "AggregatedLog", { enumerable: true, get: function () { return aggregate_log_util_1.AggregatedLog; } });
|
|
52
|
+
var batch_conversion_finalize_1 = require("./src/generators/plugin-migrations/batch-conversion-finalize");
|
|
53
|
+
Object.defineProperty(exports, "finalizeBatchConversion", { enumerable: true, get: function () { return batch_conversion_finalize_1.finalizeBatchConversion; } });
|
|
54
|
+
var batch_conversion_session_1 = require("./src/generators/plugin-migrations/batch-conversion-session");
|
|
55
|
+
Object.defineProperty(exports, "openBatchConversionSession", { enumerable: true, get: function () { return batch_conversion_session_1.openBatchConversionSession; } });
|
|
46
56
|
var executor_to_plugin_migrator_1 = require("./src/generators/plugin-migrations/executor-to-plugin-migrator");
|
|
47
57
|
Object.defineProperty(exports, "migrateProjectExecutorsToPlugin", { enumerable: true, get: function () { return executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin; } });
|
|
48
58
|
Object.defineProperty(exports, "migrateProjectExecutorsToPluginV1", { enumerable: true, get: function () { return executor_to_plugin_migrator_1.migrateProjectExecutorsToPluginV1; } });
|
|
@@ -131,12 +141,14 @@ Object.defineProperty(exports, "createPackageJson", { enumerable: true, get: fun
|
|
|
131
141
|
Object.defineProperty(exports, "createProjectGraphAndSourceMapsAsync", { enumerable: true, get: function () { return devkit_internals_3.createProjectGraphAndSourceMapsAsync; } });
|
|
132
142
|
Object.defineProperty(exports, "createProjectRootMappings", { enumerable: true, get: function () { return devkit_internals_3.createProjectRootMappings; } });
|
|
133
143
|
Object.defineProperty(exports, "createRunManyDynamicOutputRenderer", { enumerable: true, get: function () { return devkit_internals_3.createRunManyDynamicOutputRenderer; } });
|
|
144
|
+
Object.defineProperty(exports, "createTargetDefaultsResults", { enumerable: true, get: function () { return devkit_internals_3.createTargetDefaultsResults; } });
|
|
134
145
|
Object.defineProperty(exports, "createTaskId", { enumerable: true, get: function () { return devkit_internals_3.createTaskId; } });
|
|
135
146
|
Object.defineProperty(exports, "daemonClient", { enumerable: true, get: function () { return devkit_internals_3.daemonClient; } });
|
|
136
147
|
Object.defineProperty(exports, "deduceDefaultBase", { enumerable: true, get: function () { return devkit_internals_3.deduceDefaultBase; } });
|
|
137
148
|
Object.defineProperty(exports, "defaultFileRead", { enumerable: true, get: function () { return devkit_internals_3.defaultFileRead; } });
|
|
138
149
|
Object.defineProperty(exports, "deriveGroupNameFromTarget", { enumerable: true, get: function () { return devkit_internals_3.deriveGroupNameFromTarget; } });
|
|
139
150
|
Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return devkit_internals_3.directoryExists; } });
|
|
151
|
+
Object.defineProperty(exports, "dropEmptyPeerDependencySections", { enumerable: true, get: function () { return devkit_internals_3.dropEmptyPeerDependencySections; } });
|
|
140
152
|
Object.defineProperty(exports, "expandDependencyConfigSyntaxSugar", { enumerable: true, get: function () { return devkit_internals_3.expandDependencyConfigSyntaxSugar; } });
|
|
141
153
|
Object.defineProperty(exports, "expandInitiatingTasksThroughNoop", { enumerable: true, get: function () { return devkit_internals_3.expandInitiatingTasksThroughNoop; } });
|
|
142
154
|
Object.defineProperty(exports, "expandWildcardTargetConfiguration", { enumerable: true, get: function () { return devkit_internals_3.expandWildcardTargetConfiguration; } });
|
|
@@ -148,12 +160,16 @@ Object.defineProperty(exports, "findAllProjectNodeDependencies", { enumerable: t
|
|
|
148
160
|
Object.defineProperty(exports, "findInstalledPlugins", { enumerable: true, get: function () { return devkit_internals_3.findInstalledPlugins; } });
|
|
149
161
|
Object.defineProperty(exports, "findMatchingConfigFiles", { enumerable: true, get: function () { return devkit_internals_3.findMatchingConfigFiles; } });
|
|
150
162
|
Object.defineProperty(exports, "findMatchingProjects", { enumerable: true, get: function () { return devkit_internals_3.findMatchingProjects; } });
|
|
163
|
+
Object.defineProperty(exports, "findMatchingTargetNames", { enumerable: true, get: function () { return devkit_internals_3.findMatchingTargetNames; } });
|
|
151
164
|
Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return devkit_internals_3.findProjectForPath; } });
|
|
152
165
|
Object.defineProperty(exports, "findProjectsNpmDependencies", { enumerable: true, get: function () { return devkit_internals_3.findProjectsNpmDependencies; } });
|
|
153
166
|
Object.defineProperty(exports, "forceRegisterEsmLoader", { enumerable: true, get: function () { return devkit_internals_3.forceRegisterEsmLoader; } });
|
|
167
|
+
Object.defineProperty(exports, "generatePrunedDeployOutput", { enumerable: true, get: function () { return devkit_internals_3.generatePrunedDeployOutput; } });
|
|
154
168
|
Object.defineProperty(exports, "getCliPath", { enumerable: true, get: function () { return devkit_internals_3.getCliPath; } });
|
|
155
169
|
Object.defineProperty(exports, "getCustomHasher", { enumerable: true, get: function () { return devkit_internals_3.getCustomHasher; } });
|
|
156
170
|
Object.defineProperty(exports, "getDependencyConfigs", { enumerable: true, get: function () { return devkit_internals_3.getDependencyConfigs; } });
|
|
171
|
+
Object.defineProperty(exports, "getEnvFilesForTask", { enumerable: true, get: function () { return devkit_internals_3.getEnvFilesForTask; } });
|
|
172
|
+
Object.defineProperty(exports, "getEnvPathsForTask", { enumerable: true, get: function () { return devkit_internals_3.getEnvPathsForTask; } });
|
|
157
173
|
Object.defineProperty(exports, "getExecutorForTask", { enumerable: true, get: function () { return devkit_internals_3.getExecutorForTask; } });
|
|
158
174
|
Object.defineProperty(exports, "getExecutorInformation", { enumerable: true, get: function () { return devkit_internals_3.getExecutorInformation; } });
|
|
159
175
|
Object.defineProperty(exports, "getExecutorNameForTask", { enumerable: true, get: function () { return devkit_internals_3.getExecutorNameForTask; } });
|
|
@@ -193,9 +209,11 @@ Object.defineProperty(exports, "isProjectGraphExternalNode", { enumerable: true,
|
|
|
193
209
|
Object.defineProperty(exports, "isProjectGraphProjectNode", { enumerable: true, get: function () { return devkit_internals_3.isProjectGraphProjectNode; } });
|
|
194
210
|
Object.defineProperty(exports, "isRelativePath", { enumerable: true, get: function () { return devkit_internals_3.isRelativePath; } });
|
|
195
211
|
Object.defineProperty(exports, "isWholeFileChange", { enumerable: true, get: function () { return devkit_internals_3.isWholeFileChange; } });
|
|
212
|
+
Object.defineProperty(exports, "killChildOnHostExit", { enumerable: true, get: function () { return devkit_internals_3.killChildOnHostExit; } });
|
|
196
213
|
Object.defineProperty(exports, "killProcessTreeGraceful", { enumerable: true, get: function () { return devkit_internals_3.killProcessTreeGraceful; } });
|
|
197
214
|
Object.defineProperty(exports, "loadTsFile", { enumerable: true, get: function () { return devkit_internals_3.loadTsFile; } });
|
|
198
215
|
Object.defineProperty(exports, "mergeTargetConfigurations", { enumerable: true, get: function () { return devkit_internals_3.mergeTargetConfigurations; } });
|
|
216
|
+
Object.defineProperty(exports, "movePeerDependencyToDependencies", { enumerable: true, get: function () { return devkit_internals_3.movePeerDependencyToDependencies; } });
|
|
199
217
|
Object.defineProperty(exports, "multiselectPrompt", { enumerable: true, get: function () { return devkit_internals_3.multiselectPrompt; } });
|
|
200
218
|
Object.defineProperty(exports, "normalizeDependencyConfigDefinition", { enumerable: true, get: function () { return devkit_internals_3.normalizeDependencyConfigDefinition; } });
|
|
201
219
|
Object.defineProperty(exports, "normalizeDependencyConfigProjects", { enumerable: true, get: function () { return devkit_internals_3.normalizeDependencyConfigProjects; } });
|
|
@@ -203,6 +221,7 @@ Object.defineProperty(exports, "normalizeTargetDependencyWithStringProjects", {
|
|
|
203
221
|
Object.defineProperty(exports, "nxVersion", { enumerable: true, get: function () { return devkit_internals_3.nxVersion; } });
|
|
204
222
|
Object.defineProperty(exports, "orange", { enumerable: true, get: function () { return devkit_internals_3.orange; } });
|
|
205
223
|
Object.defineProperty(exports, "parseExecutor", { enumerable: true, get: function () { return devkit_internals_3.parseExecutor; } });
|
|
224
|
+
Object.defineProperty(exports, "parseVersionFromPackageManagerField", { enumerable: true, get: function () { return devkit_internals_3.parseVersionFromPackageManagerField; } });
|
|
206
225
|
Object.defineProperty(exports, "preventRecursionInGraphConstruction", { enumerable: true, get: function () { return devkit_internals_3.preventRecursionInGraphConstruction; } });
|
|
207
226
|
Object.defineProperty(exports, "readCachedProjectConfiguration", { enumerable: true, get: function () { return devkit_internals_3.readCachedProjectConfiguration; } });
|
|
208
227
|
Object.defineProperty(exports, "readFileIfExisting", { enumerable: true, get: function () { return devkit_internals_3.readFileIfExisting; } });
|
|
@@ -214,9 +233,11 @@ Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: funct
|
|
|
214
233
|
Object.defineProperty(exports, "readProjectAndTargetFromTargetString", { enumerable: true, get: function () { return devkit_internals_3.readProjectAndTargetFromTargetString; } });
|
|
215
234
|
Object.defineProperty(exports, "registerTsConfigPaths", { enumerable: true, get: function () { return devkit_internals_3.registerTsConfigPaths; } });
|
|
216
235
|
Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return devkit_internals_3.registerTsProject; } });
|
|
236
|
+
Object.defineProperty(exports, "relocatePrunedLocalPathSpec", { enumerable: true, get: function () { return devkit_internals_3.relocatePrunedLocalPathSpec; } });
|
|
217
237
|
Object.defineProperty(exports, "removeTasksFromTaskGraph", { enumerable: true, get: function () { return devkit_internals_3.removeTasksFromTaskGraph; } });
|
|
218
238
|
Object.defineProperty(exports, "requireWithTsconfigFallback", { enumerable: true, get: function () { return devkit_internals_3.requireWithTsconfigFallback; } });
|
|
219
239
|
Object.defineProperty(exports, "resetWorkspaceContext", { enumerable: true, get: function () { return devkit_internals_3.resetWorkspaceContext; } });
|
|
240
|
+
Object.defineProperty(exports, "resolveCommandSyntacticSugar", { enumerable: true, get: function () { return devkit_internals_3.resolveCommandSyntacticSugar; } });
|
|
220
241
|
Object.defineProperty(exports, "runNxSync", { enumerable: true, get: function () { return devkit_internals_3.runNxSync; } });
|
|
221
242
|
Object.defineProperty(exports, "safeExecFileSync", { enumerable: true, get: function () { return devkit_internals_3.safeExecFileSync; } });
|
|
222
243
|
Object.defineProperty(exports, "safeSpawn", { enumerable: true, get: function () { return devkit_internals_3.safeSpawn; } });
|
|
@@ -231,5 +252,6 @@ Object.defineProperty(exports, "transformLegacyOutputs", { enumerable: true, get
|
|
|
231
252
|
Object.defineProperty(exports, "textPrompt", { enumerable: true, get: function () { return devkit_internals_3.textPrompt; } });
|
|
232
253
|
Object.defineProperty(exports, "unparse", { enumerable: true, get: function () { return devkit_internals_3.unparse; } });
|
|
233
254
|
Object.defineProperty(exports, "validateOutputs", { enumerable: true, get: function () { return devkit_internals_3.validateOutputs; } });
|
|
255
|
+
Object.defineProperty(exports, "warnUnshippableLocalPathSpec", { enumerable: true, get: function () { return devkit_internals_3.warnUnshippableLocalPathSpec; } });
|
|
234
256
|
Object.defineProperty(exports, "workspaceDataDirectory", { enumerable: true, get: function () { return devkit_internals_3.workspaceDataDirectory; } });
|
|
235
257
|
Object.defineProperty(exports, "workspaceRootInner", { enumerable: true, get: function () { return devkit_internals_3.workspaceRootInner; } });
|
package/dist/ngcli-adapter.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.createBuilderContext = exports.NxScopedHost = exports.mockSchematicsForT
|
|
|
4
4
|
/**
|
|
5
5
|
* @category Ng CLI Adapter
|
|
6
6
|
*/
|
|
7
|
-
//
|
|
7
|
+
// oxlint-disable-next-line no-restricted-imports
|
|
8
8
|
var ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
|
|
9
9
|
Object.defineProperty(exports, "wrapAngularDevkitSchematic", { enumerable: true, get: function () { return ngcli_adapter_1.wrapAngularDevkitSchematic; } });
|
|
10
10
|
Object.defineProperty(exports, "mockSchematicsForTesting", { enumerable: true, get: function () { return ngcli_adapter_1.mockSchematicsForTesting; } });
|
|
@@ -5,6 +5,12 @@ interface E2EWebServerDefaultValues {
|
|
|
5
5
|
defaultE2EWebServerAddress: string;
|
|
6
6
|
defaultE2ECiBaseUrl: string;
|
|
7
7
|
defaultE2EPort: number;
|
|
8
|
+
/**
|
|
9
|
+
* Set when the port was explicitly requested rather than defaulted. The caller has
|
|
10
|
+
* already applied it to both URLs above, so this helper must not re-derive from
|
|
11
|
+
* targetDefaults — doing so overrides the request and desyncs the two URLs.
|
|
12
|
+
*/
|
|
13
|
+
e2EPortIsExplicit?: boolean;
|
|
8
14
|
}
|
|
9
15
|
interface E2EWebServerPluginOptions {
|
|
10
16
|
plugin: string;
|
|
@@ -36,10 +36,14 @@ async function getE2EWebServerInfoForPlugin(tree, projectName, pluginOptions, de
|
|
|
36
36
|
let e2ePort = defaultValues.defaultE2EPort ?? 4200;
|
|
37
37
|
const serveTargetName = foundPlugin.options[pluginOptions.serveTargetName] ??
|
|
38
38
|
defaultValues.defaultServeTargetName;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
39
|
+
if (!defaultValues.e2EPortIsExplicit) {
|
|
40
|
+
e2ePort =
|
|
41
|
+
(0, target_defaults_utils_1.readTargetDefaultsForTarget)(serveTargetName, nxJson.targetDefaults)
|
|
42
|
+
?.options?.port ?? e2ePort;
|
|
43
|
+
}
|
|
44
|
+
const e2eWebServerAddress = defaultValues.e2EPortIsExplicit
|
|
45
|
+
? defaultValues.defaultE2EWebServerAddress
|
|
46
|
+
: defaultValues.defaultE2EWebServerAddress.replace(/:\d+/, `:${e2ePort}`);
|
|
43
47
|
return {
|
|
44
48
|
e2eWebServerAddress,
|
|
45
49
|
e2eWebServerCommand: `${pm.exec} nx run ${projectName}:${serveTargetName}`,
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type Tree, logger as devkitLogger } from 'nx/src/devkit-exports';
|
|
2
|
+
import type { BatchConversionSession } from './batch-conversion-session';
|
|
3
|
+
type Logger = typeof devkitLogger;
|
|
4
|
+
/**
|
|
5
|
+
* Batch finalize: the deferred equivalent of Phase 3's hoist + cleanup and
|
|
6
|
+
* Phase 4's verification, run once over every plan the batch session staged.
|
|
7
|
+
* Planning happens on a clone of the final `nx.json`; a single combined
|
|
8
|
+
* verification inference pass (all trusted plugin registrations, in final
|
|
9
|
+
* order) supplies the ownership oracle and the per-pair equivalence inputs;
|
|
10
|
+
* only then is the accepted outcome applied to the Tree as a precomputed byte
|
|
11
|
+
* write-set.
|
|
12
|
+
*
|
|
13
|
+
* Finalization is optional deduplication: the Tree already holds each child's
|
|
14
|
+
* conservative full-residual output. Any failure here (including an apply
|
|
15
|
+
* failure, after restoring the write-set's snapshots) is caught, reported as
|
|
16
|
+
* a single warning, and swallowed so the batch's callbacks still run.
|
|
17
|
+
*/
|
|
18
|
+
export declare function finalizeBatchConversion(tree: Tree, session: BatchConversionSession, logger?: Logger): Promise<void>;
|
|
19
|
+
export {};
|