From 4f21ea72cb493333597929b1e470186defd8a8ce Mon Sep 17 00:00:00 2001 From: Matthieu Riegler Date: Mon, 27 Oct 2025 19:21:20 +0100 Subject: [PATCH] refactor(compiler-cli): Remove deep imports of `compiler-cli` in angular/core migration schematics will pull from `compiler-cli/private/migrations` core tests will pull from `compiler-cli/private/testing` (cherry picked from commit 8e50cdb930c99e435a937afa212ab09290b3443a) --- packages/compiler-cli/index.ts | 11 +++- packages/compiler-cli/package.json | 14 ++--- packages/compiler-cli/private/BUILD.bazel | 8 +++ packages/compiler-cli/private/migrations.ts | 54 +++++++++++++++++-- packages/compiler-cli/private/testing.ts | 13 +++++ .../src/ngtsc/annotations/index.ts | 8 +++ packages/compiler-cli/src/ngtsc/core/index.ts | 1 + packages/core/BUILD.bazel | 3 -- .../application-config-core/BUILD.bazel | 1 - .../bootstrap-options-migration/BUILD.bazel | 2 - .../migration.spec.ts | 2 +- .../bootstrap-options-migration/migration.ts | 10 ++-- .../BUILD.bazel | 2 - .../common-to-standalone-migration/index.ts | 2 +- .../common-to-standalone-migration/util.ts | 3 +- .../ngclass-to-class-migration/BUILD.bazel | 6 --- .../ngclass-to-class-migration/util.ts | 7 ++- .../ngstyle-to-style-migration/BUILD.bazel | 6 --- .../ngstyle-to-style-migration/util.ts | 3 +- .../migrations/output-migration/BUILD.bazel | 6 --- .../output-migration/output-migration.spec.ts | 4 +- .../output-migration/output-migration.ts | 8 +-- .../output-migration/output_helpers.ts | 8 +-- .../router-current-navigation/BUILD.bazel | 1 - .../BUILD.bazel | 1 - .../BUILD.bazel | 1 - .../router-testing-module-migration/index.ts | 2 +- .../self-closing-tags-migration/BUILD.bazel | 7 --- .../self-closing-tags-migration.spec.ts | 4 +- .../signal-migration/src/BUILD.bazel | 19 ------- .../signal-migration/src/analysis_deps.ts | 18 ++++--- .../migrations/signal-migration/src/cli.ts | 2 +- .../src/convert-input/convert_to_signal.ts | 9 ++-- .../src/convert-input/prepare_and_check.ts | 3 +- .../src/input_detection/input_decorator.ts | 34 +++++------- .../signal-migration/src/migration.ts | 4 +- .../signal-migration/src/migration_host.ts | 2 +- .../src/passes/10_apply_import_manager.ts | 2 +- .../src/passes/1_identify_inputs.ts | 9 ++-- .../passes/2_find_source_file_references.ts | 10 ++-- .../passes/3_check_incompatible_patterns.ts | 2 +- .../src/passes/4_check_inheritance.ts | 2 +- .../passes/6_migrate_input_declarations.ts | 4 +- .../passes/9_migrate_ts_type_references.ts | 2 +- .../problematic_patterns/check_inheritance.ts | 8 +-- .../common_incompatible_patterns.ts | 2 +- .../migrate_ts_type_references.ts | 2 +- .../identify_host_references.ts | 9 ++-- .../identify_template_references.ts | 22 ++++---- .../src/passes/reference_resolution/index.ts | 10 ++-- .../template_reference_visitor.ts | 2 +- .../signal-migration/src/phase_analysis.ts | 2 +- .../signal-migration/src/phase_migrate.ts | 2 +- .../src/utils/extract_template.ts | 10 ++-- .../src/write_replacements.ts | 4 +- .../signal-migration/test/BUILD.bazel | 2 - .../signal-migration/test/migration_spec.ts | 4 +- .../signal-queries-migration/BUILD.bazel | 6 --- .../identify_queries.ts | 13 ++--- .../migration.spec.ts | 12 ++--- .../signal-queries-migration/migration.ts | 10 ++-- .../query_api_names.ts | 2 +- .../cleanup-unused-imports/BUILD.bazel | 1 - .../unused_imports_migration.ts | 3 +- .../ng-generate/output-migration/BUILD.bazel | 1 - .../route-lazy-loading/BUILD.bazel | 2 - .../route-lazy-loading/to-lazy-routes.ts | 5 +- .../ng-generate/route-lazy-loading/util.ts | 3 +- .../self-closing-tags-migration/BUILD.bazel | 2 +- .../signal-input-migration/BUILD.bazel | 2 +- .../signal-queries-migration/BUILD.bazel | 2 +- packages/core/schematics/utils/BUILD.bazel | 2 +- .../schematics/utils/ng_component_template.ts | 2 +- .../core/schematics/utils/tsurge/BUILD.bazel | 8 +-- .../schematics/utils/tsurge/base_migration.ts | 3 +- .../utils/tsurge/executors/analyze_exec.ts | 2 +- .../utils/tsurge/executors/migrate_exec.ts | 2 +- .../tsurge/helpers/apply_import_manager.ts | 4 +- .../utils/tsurge/helpers/ast/BUILD.bazel | 10 +--- .../utils/tsurge/helpers/create_program.ts | 15 +++--- .../utils/tsurge/helpers/ngtsc_program.ts | 5 +- .../utils/tsurge/helpers/ts_parse_config.ts | 4 +- .../utils/tsurge/helpers/ts_program.ts | 4 +- .../schematics/utils/tsurge/program_info.ts | 6 +-- .../schematics/utils/tsurge/project_paths.ts | 2 +- .../schematics/utils/tsurge/test/BUILD.bazel | 9 +--- .../tsurge/test/g3_target_detection.spec.ts | 7 +-- .../utils/tsurge/test/output_helpers.ts | 14 ++--- .../tsurge/test/output_migration.spec.ts | 4 +- .../utils/tsurge/test/output_migration.ts | 8 +-- .../utils/tsurge/testing/run_single.ts | 8 +-- .../utils/tsurge/testing/test_run.ts | 2 +- .../test/acceptance/authoring/BUILD.bazel | 5 +- .../authoring/authoring_test_compiler.ts | 8 +-- 94 files changed, 298 insertions(+), 299 deletions(-) create mode 100644 packages/compiler-cli/private/testing.ts diff --git a/packages/compiler-cli/index.ts b/packages/compiler-cli/index.ts index eb33c466e8b..738e5a65e93 100644 --- a/packages/compiler-cli/index.ts +++ b/packages/compiler-cli/index.ts @@ -35,7 +35,16 @@ export {OptimizeFor} from './src/ngtsc/typecheck/api'; // needing to use a default import. NodeJS will expose named CJS exports as named ESM exports. // TODO(devversion): Remove these duplicate exports once devmode&prodmode is combined/ESM. export {ConsoleLogger, Logger, LogLevel} from './src/ngtsc/logging'; -export {NodeJSFileSystem, absoluteFrom, FileSystem, AbsoluteFsPath} from './src/ngtsc/file_system'; +export { + NodeJSFileSystem, + absoluteFrom, + FileSystem, + AbsoluteFsPath, + NgtscCompilerHost, + getFileSystem, + setFileSystem, + isLocalRelativePath, +} from './src/ngtsc/file_system'; // Export documentation entities for Angular-internal API doc generation. export * from './src/ngtsc/docs'; diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json index 0512435f276..25e1ed06d7f 100644 --- a/packages/compiler-cli/package.json +++ b/packages/compiler-cli/package.json @@ -24,17 +24,9 @@ "types": "./linker/babel/index.d.ts", "default": "./bundles/linker/babel/index.js" }, - "./private/localize": { - "types": "./private/localize.d.ts", - "default": "./bundles/private/localize.js" - }, - "./private/migrations": { - "types": "./private/migrations.d.ts", - "default": "./bundles/private/migrations.js" - }, - "./private/tooling": { - "types": "./private/tooling.d.ts", - "default": "./bundles/private/tooling.js" + "./private/*": { + "types": "./private/*.d.ts", + "default": "./bundles/private/*.js" } }, "dependencies": { diff --git a/packages/compiler-cli/private/BUILD.bazel b/packages/compiler-cli/private/BUILD.bazel index 9c62943a20a..2b4a9513309 100644 --- a/packages/compiler-cli/private/BUILD.bazel +++ b/packages/compiler-cli/private/BUILD.bazel @@ -7,6 +7,7 @@ copy_to_bin( srcs = [ "localize.ts", "migrations.ts", + "testing.ts", "tooling.ts", ], ) @@ -17,15 +18,22 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler-cli/src/ngtsc/annotations", + "//packages/compiler-cli/src/ngtsc/core", + "//packages/compiler-cli/src/ngtsc/diagnostics", "//packages/compiler-cli/src/ngtsc/file_system", + "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/imports", "//packages/compiler-cli/src/ngtsc/logging", + "//packages/compiler-cli/src/ngtsc/metadata", "//packages/compiler-cli/src/ngtsc/partial_evaluator", "//packages/compiler-cli/src/ngtsc/perf", "//packages/compiler-cli/src/ngtsc/reflection", + "//packages/compiler-cli/src/ngtsc/shims", "//packages/compiler-cli/src/ngtsc/sourcemaps", + "//packages/compiler-cli/src/ngtsc/transform", "//packages/compiler-cli/src/ngtsc/transform/jit", "//packages/compiler-cli/src/ngtsc/translator", "//packages/compiler-cli/src/ngtsc/typecheck/api", + "//packages/compiler-cli/src/ngtsc/util", ], ) diff --git a/packages/compiler-cli/private/migrations.ts b/packages/compiler-cli/private/migrations.ts index 28acb9798f5..602c7416226 100644 --- a/packages/compiler-cli/private/migrations.ts +++ b/packages/compiler-cli/private/migrations.ts @@ -11,9 +11,43 @@ * package requires for migration schematics. */ -export {createForwardRefResolver} from '../src/ngtsc/annotations'; -export {AbsoluteFsPath} from '../src/ngtsc/file_system'; -export {Reference} from '../src/ngtsc/imports'; +export { + createForwardRefResolver, + ExternalTemplateDeclaration, + extractDecoratorQueryMetadata, + extractTemplate, + findAngularDecorator, + getAngularDecorators, + InlineTemplateDeclaration, + queryDecoratorNames, + QueryFunctionName, + ResourceLoader, + unwrapExpression, + parseDecoratorInputTransformFunction, +} from '../src/ngtsc/annotations'; +export { + AbsoluteFsPath, + FileSystem, + getFileSystem, + isLocalRelativePath, + NodeJSFileSystem, +} from '../src/ngtsc/file_system'; +export {CompilationMode} from '../src/ngtsc/transform'; + +export { + DiagnosticCategoryLabel, + NgCompiler, + NgCompilerOptions, + UnifiedModulesHost, +} from '../src/ngtsc/core'; +export {Reference, ReferenceEmitter, ReferenceEmitKind} from '../src/ngtsc/imports'; +export { + DecoratorInputTransform, + DtsMetadataReader, + MetadataReader, + DirectiveMeta, + InputMapping, +} from '../src/ngtsc/metadata'; export { DynamicValue, PartialEvaluator, @@ -21,11 +55,23 @@ export { ResolvedValueMap, StaticInterpreter, } from '../src/ngtsc/partial_evaluator'; -export {reflectObjectLiteral, TypeScriptReflectionHost} from '../src/ngtsc/reflection'; +export { + ClassDeclaration, + Decorator, + ReflectionHost, + reflectObjectLiteral, + TypeScriptReflectionHost, +} from '../src/ngtsc/reflection'; export { PotentialImport, PotentialImportKind, PotentialImportMode, + SymbolKind, TemplateTypeChecker, } from '../src/ngtsc/typecheck/api'; + +export {getRootDirs} from '../src/ngtsc/util/src/typescript'; + +export {FatalDiagnosticError} from '../src/ngtsc/diagnostics'; +export {isShim} from '../src/ngtsc/shims'; export {ImportManager} from '../src/ngtsc/translator'; diff --git a/packages/compiler-cli/private/testing.ts b/packages/compiler-cli/private/testing.ts new file mode 100644 index 00000000000..d8e8a848acb --- /dev/null +++ b/packages/compiler-cli/private/testing.ts @@ -0,0 +1,13 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.dev/license + */ + +export {ImportedSymbolsTracker} from '../src/ngtsc/imports'; +export {TypeScriptReflectionHost} from '../src/ngtsc/reflection'; +export {getInitializerApiJitTransform} from '../src/ngtsc/transform/jit'; + +export {initMockFileSystem, MockFileSystem} from '../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/index.ts b/packages/compiler-cli/src/ngtsc/annotations/index.ts index f1ed6df6a09..49260beba99 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/index.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/index.ts @@ -18,8 +18,14 @@ export { ResourceLoader, ResourceLoaderContext, JitDeclarationRegistry, + unwrapExpression, } from './common'; export {ComponentDecoratorHandler} from './component'; +export { + extractTemplate, + ExternalTemplateDeclaration, + InlineTemplateDeclaration, +} from './component/src/resources'; export { DirectiveDecoratorHandler, InitializerApiFunction, @@ -34,6 +40,8 @@ export { tryParseSignalInputMapping, tryParseSignalModelMapping, tryParseSignalQueryFromInitializer, + extractDecoratorQueryMetadata, + parseDecoratorInputTransformFunction, } from './directive'; export {NgModuleDecoratorHandler} from './ng_module'; export {InjectableDecoratorHandler} from './src/injectable'; diff --git a/packages/compiler-cli/src/ngtsc/core/index.ts b/packages/compiler-cli/src/ngtsc/core/index.ts index 4292b72f2c8..ae31d5de6f9 100644 --- a/packages/compiler-cli/src/ngtsc/core/index.ts +++ b/packages/compiler-cli/src/ngtsc/core/index.ts @@ -8,3 +8,4 @@ export * from './src/compiler'; export {NgCompilerHost} from './src/host'; +export {UnifiedModulesHost, NgCompilerOptions, DiagnosticCategoryLabel} from './api'; diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel index cbae25a6d81..52d7dc633b9 100644 --- a/packages/core/BUILD.bazel +++ b/packages/core/BUILD.bazel @@ -75,9 +75,6 @@ ng_package( "//integration:__subpackages__", "//modules/ssr-benchmarks:__subpackages__", "//packages/bazel/test/ng_package:__pkg__", - "//packages/compiler-cli/src/ngtsc/metadata/test:__subpackages__", - "//packages/compiler-cli/src/ngtsc/typecheck/extended/test:__subpackages__", - "//packages/compiler-cli/src/ngtsc/typecheck/test:__subpackages__", "//packages/compiler-cli/test:__subpackages__", "//packages/compiler/test:__pkg__", "//packages/language-service/test:__pkg__", diff --git a/packages/core/schematics/migrations/application-config-core/BUILD.bazel b/packages/core/schematics/migrations/application-config-core/BUILD.bazel index 77e0d1a10de..0a0ebf9335f 100644 --- a/packages/core/schematics/migrations/application-config-core/BUILD.bazel +++ b/packages/core/schematics/migrations/application-config-core/BUILD.bazel @@ -14,7 +14,6 @@ ts_project( "//:node_modules/@angular-devkit/schematics", "//:node_modules/typescript", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/bootstrap-options-migration/BUILD.bazel b/packages/core/schematics/migrations/bootstrap-options-migration/BUILD.bazel index 34080dd802a..d9437118fd8 100644 --- a/packages/core/schematics/migrations/bootstrap-options-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/bootstrap-options-migration/BUILD.bazel @@ -17,7 +17,6 @@ ts_project( "//:node_modules/@angular-devkit/schematics", "//:node_modules/typescript", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", @@ -32,7 +31,6 @@ ts_project( ":bootstrap-options-migration", "//:node_modules/typescript", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/core/schematics/utils/tsurge", ], ) diff --git a/packages/core/schematics/migrations/bootstrap-options-migration/migration.spec.ts b/packages/core/schematics/migrations/bootstrap-options-migration/migration.spec.ts index 9c90b14de2c..9083b258955 100644 --- a/packages/core/schematics/migrations/bootstrap-options-migration/migration.spec.ts +++ b/packages/core/schematics/migrations/bootstrap-options-migration/migration.spec.ts @@ -7,7 +7,7 @@ */ import {absoluteFrom} from '@angular/compiler-cli'; -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {runTsurgeMigration} from '../../utils/tsurge/testing'; import {diffText} from '../../utils/tsurge/testing/diff'; import {BootstrapOptionsMigration} from './migration'; diff --git a/packages/core/schematics/migrations/bootstrap-options-migration/migration.ts b/packages/core/schematics/migrations/bootstrap-options-migration/migration.ts index 6abee5bbaef..13ac97d7dc2 100644 --- a/packages/core/schematics/migrations/bootstrap-options-migration/migration.ts +++ b/packages/core/schematics/migrations/bootstrap-options-migration/migration.ts @@ -16,10 +16,14 @@ import { projectFile, } from '../../utils/tsurge'; import ts from 'typescript'; -import {PartialEvaluator, Reference, ImportManager} from '@angular/compiler-cli/private/migrations'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +import { + PartialEvaluator, + Reference, + ImportManager, + TypeScriptReflectionHost, + getAngularDecorators, +} from '@angular/compiler-cli/private/migrations'; import {applyImportManagerChanges} from '../../utils/tsurge/helpers/apply_import_manager'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; import {findLiteralProperty} from '../../utils/typescript/property_name'; import {getImportSpecifier} from '../../utils/typescript/imports'; import {isReferenceToImport} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/common-to-standalone-migration/BUILD.bazel b/packages/core/schematics/migrations/common-to-standalone-migration/BUILD.bazel index d1a80047738..f0c997f81b7 100644 --- a/packages/core/schematics/migrations/common-to-standalone-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/common-to-standalone-migration/BUILD.bazel @@ -21,8 +21,6 @@ ts_project( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/common-to-standalone-migration/index.ts b/packages/core/schematics/migrations/common-to-standalone-migration/index.ts index 87f0d31845c..ad338754854 100644 --- a/packages/core/schematics/migrations/common-to-standalone-migration/index.ts +++ b/packages/core/schematics/migrations/common-to-standalone-migration/index.ts @@ -9,7 +9,7 @@ import {Rule} from '@angular-devkit/schematics'; import {CommonToStandaloneMigration} from './migration'; import {MigrationStage, runMigrationInDevkit} from '../../utils/tsurge/helpers/angular_devkit'; -import {FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {FileSystem} from '@angular/compiler-cli/private/migrations'; interface Options { path: string; diff --git a/packages/core/schematics/migrations/common-to-standalone-migration/util.ts b/packages/core/schematics/migrations/common-to-standalone-migration/util.ts index 6493f04d80e..c1859b89737 100644 --- a/packages/core/schematics/migrations/common-to-standalone-migration/util.ts +++ b/packages/core/schematics/migrations/common-to-standalone-migration/util.ts @@ -9,8 +9,7 @@ import ts from 'typescript'; import {ProgramInfo, projectFile, Replacement, TextUpdate, ProjectFile} from '../../utils/tsurge'; import {applyImportManagerChanges} from '../../utils/tsurge/helpers/apply_import_manager'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {ImportManager} from '@angular/compiler-cli/private/migrations'; +import {ImportManager, TypeScriptReflectionHost} from '@angular/compiler-cli/private/migrations'; import {getImportOfIdentifier} from '../../utils/typescript/imports'; export interface TemplateAnalysis { diff --git a/packages/core/schematics/migrations/ngclass-to-class-migration/BUILD.bazel b/packages/core/schematics/migrations/ngclass-to-class-migration/BUILD.bazel index 1eeac99db90..bf30ea759ee 100644 --- a/packages/core/schematics/migrations/ngclass-to-class-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/ngclass-to-class-migration/BUILD.bazel @@ -23,12 +23,6 @@ ts_project( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/directive", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/ngclass-to-class-migration/util.ts b/packages/core/schematics/migrations/ngclass-to-class-migration/util.ts index c75f65c5a92..b4e57f718f2 100644 --- a/packages/core/schematics/migrations/ngclass-to-class-migration/util.ts +++ b/packages/core/schematics/migrations/ngclass-to-class-migration/util.ts @@ -19,8 +19,11 @@ import ts from 'typescript'; import {applyImportManagerChanges} from '../../utils/tsurge/helpers/apply_import_manager'; import {MigrationConfig} from './types'; import {getImportSpecifiers} from '../../utils/typescript/imports'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {ImportManager, PartialEvaluator} from '@angular/compiler-cli/private/migrations'; +import { + ImportManager, + PartialEvaluator, + TypeScriptReflectionHost, +} from '@angular/compiler-cli/private/migrations'; import {canRemoveCommonModule, parseTemplate} from '../../utils/parse_html'; const ngClassStr = 'NgClass'; diff --git a/packages/core/schematics/migrations/ngstyle-to-style-migration/BUILD.bazel b/packages/core/schematics/migrations/ngstyle-to-style-migration/BUILD.bazel index 31bbdaeca5b..ec1e094f990 100644 --- a/packages/core/schematics/migrations/ngstyle-to-style-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/ngstyle-to-style-migration/BUILD.bazel @@ -23,12 +23,6 @@ ts_project( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/directive", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/ngstyle-to-style-migration/util.ts b/packages/core/schematics/migrations/ngstyle-to-style-migration/util.ts index 1140176add4..474c991d90e 100644 --- a/packages/core/schematics/migrations/ngstyle-to-style-migration/util.ts +++ b/packages/core/schematics/migrations/ngstyle-to-style-migration/util.ts @@ -7,6 +7,7 @@ */ import {visitAll, RecursiveVisitor, Element} from '@angular/compiler'; +import {TypeScriptReflectionHost, ImportManager} from '@angular/compiler-cli/private/migrations'; import { ProgramInfo, projectFile, @@ -19,8 +20,6 @@ import ts from 'typescript'; import {applyImportManagerChanges} from '../../utils/tsurge/helpers/apply_import_manager'; import {MigrationConfig} from './types'; import {getImportSpecifiers} from '../../utils/typescript/imports'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {ImportManager} from '@angular/compiler-cli/private/migrations'; import {canRemoveCommonModule, parseTemplate} from '../../utils/parse_html'; const ngStyleStr = 'NgStyle'; diff --git a/packages/core/schematics/migrations/output-migration/BUILD.bazel b/packages/core/schematics/migrations/output-migration/BUILD.bazel index bb1c509ff2b..2f6f7e774f0 100644 --- a/packages/core/schematics/migrations/output-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/output-migration/BUILD.bazel @@ -16,11 +16,6 @@ ts_project( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/directive", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/migrations/signal-migration/src", "//packages/core/schematics/utils/tsurge", ], @@ -35,7 +30,6 @@ ts_project( deps = [ ":migration", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/core/schematics/utils/tsurge", ], ) diff --git a/packages/core/schematics/migrations/output-migration/output-migration.spec.ts b/packages/core/schematics/migrations/output-migration/output-migration.spec.ts index fd29b798d56..905d85e4194 100644 --- a/packages/core/schematics/migrations/output-migration/output-migration.spec.ts +++ b/packages/core/schematics/migrations/output-migration/output-migration.spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {runTsurgeMigration} from '../../utils/tsurge/testing'; import {diffText} from '../../utils/tsurge/testing/diff'; -import {absoluteFrom} from '@angular/compiler-cli'; import {OutputMigration} from './output-migration'; describe('outputs', () => { diff --git a/packages/core/schematics/migrations/output-migration/output-migration.ts b/packages/core/schematics/migrations/output-migration/output-migration.ts index fd2c376f17d..ecee9bc66ac 100644 --- a/packages/core/schematics/migrations/output-migration/output-migration.ts +++ b/packages/core/schematics/migrations/output-migration/output-migration.ts @@ -19,9 +19,11 @@ import { TsurgeFunnelMigration, } from '../../utils/tsurge'; -import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {PartialEvaluator} from '@angular/compiler-cli/private/migrations'; +import { + DtsMetadataReader, + TypeScriptReflectionHost, + PartialEvaluator, +} from '@angular/compiler-cli/private/migrations'; import { getUniqueIdForProperty, isTargetOutputDeclaration, diff --git a/packages/core/schematics/migrations/output-migration/output_helpers.ts b/packages/core/schematics/migrations/output-migration/output_helpers.ts index 1a46ad21329..dba90f02b10 100644 --- a/packages/core/schematics/migrations/output-migration/output_helpers.ts +++ b/packages/core/schematics/migrations/output-migration/output_helpers.ts @@ -11,10 +11,10 @@ import { ReflectionHost, ClassDeclaration, Decorator, -} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {Reference} from '@angular/compiler-cli/src/ngtsc/imports'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; + getAngularDecorators, + Reference, + DtsMetadataReader, +} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo, projectFile} from '../../utils/tsurge'; import { diff --git a/packages/core/schematics/migrations/router-current-navigation/BUILD.bazel b/packages/core/schematics/migrations/router-current-navigation/BUILD.bazel index 3ca863aa039..9e094fc14fd 100644 --- a/packages/core/schematics/migrations/router-current-navigation/BUILD.bazel +++ b/packages/core/schematics/migrations/router-current-navigation/BUILD.bazel @@ -15,7 +15,6 @@ ts_project( "//:node_modules/@types/node", "//:node_modules/typescript", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/router-last-successful-navigation/BUILD.bazel b/packages/core/schematics/migrations/router-last-successful-navigation/BUILD.bazel index afbc559a2ac..af6bba152bd 100644 --- a/packages/core/schematics/migrations/router-last-successful-navigation/BUILD.bazel +++ b/packages/core/schematics/migrations/router-last-successful-navigation/BUILD.bazel @@ -15,7 +15,6 @@ ts_project( "//:node_modules/@types/node", "//:node_modules/typescript", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/router-testing-module-migration/BUILD.bazel b/packages/core/schematics/migrations/router-testing-module-migration/BUILD.bazel index a9075690b11..6672d736b44 100644 --- a/packages/core/schematics/migrations/router-testing-module-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/router-testing-module-migration/BUILD.bazel @@ -19,7 +19,6 @@ ts_project( "//:node_modules/@angular-devkit/schematics", "//:node_modules/typescript", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/migrations/router-testing-module-migration/index.ts b/packages/core/schematics/migrations/router-testing-module-migration/index.ts index 235a1e29059..15e78890bc5 100644 --- a/packages/core/schematics/migrations/router-testing-module-migration/index.ts +++ b/packages/core/schematics/migrations/router-testing-module-migration/index.ts @@ -7,7 +7,7 @@ */ import {Rule} from '@angular-devkit/schematics'; -import {FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {FileSystem} from '@angular/compiler-cli/private/migrations'; import {MigrationStage, runMigrationInDevkit} from '../../utils/tsurge/helpers/angular_devkit'; import {RouterTestingModuleMigration} from './migration'; diff --git a/packages/core/schematics/migrations/self-closing-tags-migration/BUILD.bazel b/packages/core/schematics/migrations/self-closing-tags-migration/BUILD.bazel index 7ffdb2673b9..f12958bb085 100644 --- a/packages/core/schematics/migrations/self-closing-tags-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/self-closing-tags-migration/BUILD.bazel @@ -16,12 +16,6 @@ ts_project( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/directive", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", ], @@ -36,7 +30,6 @@ ts_project( deps = [ ":migration", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/core/schematics/utils/tsurge", ], ) diff --git a/packages/core/schematics/migrations/self-closing-tags-migration/self-closing-tags-migration.spec.ts b/packages/core/schematics/migrations/self-closing-tags-migration/self-closing-tags-migration.spec.ts index 17e25e1b7fc..c0029289318 100644 --- a/packages/core/schematics/migrations/self-closing-tags-migration/self-closing-tags-migration.spec.ts +++ b/packages/core/schematics/migrations/self-closing-tags-migration/self-closing-tags-migration.spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import {runTsurgeMigration, diffText} from '../../utils/tsurge/testing'; import {absoluteFrom} from '@angular/compiler-cli'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; +import {runTsurgeMigration, diffText} from '../../utils/tsurge/testing'; import {SelfClosingTagsMigration} from './self-closing-tags-migration'; describe('self-closing tags', () => { diff --git a/packages/core/schematics/migrations/signal-migration/src/BUILD.bazel b/packages/core/schematics/migrations/signal-migration/src/BUILD.bazel index 78fec20cd70..dc6c8c7cf44 100644 --- a/packages/core/schematics/migrations/signal-migration/src/BUILD.bazel +++ b/packages/core/schematics/migrations/signal-migration/src/BUILD.bazel @@ -19,25 +19,6 @@ ts_project( "//:node_modules/typescript", "//packages/compiler", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/common", - "//packages/compiler-cli/src/ngtsc/annotations/component", - "//packages/compiler-cli/src/ngtsc/annotations/directive", - "//packages/compiler-cli/src/ngtsc/core", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/diagnostics", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/incremental", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/partial_evaluator", - "//packages/compiler-cli/src/ngtsc/program_driver", - "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/ngtsc/shims", - "//packages/compiler-cli/src/ngtsc/transform", - "//packages/compiler-cli/src/ngtsc/translator", - "//packages/compiler-cli/src/ngtsc/typecheck", - "//packages/compiler-cli/src/ngtsc/typecheck/api", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/ast", ], diff --git a/packages/core/schematics/migrations/signal-migration/src/analysis_deps.ts b/packages/core/schematics/migrations/signal-migration/src/analysis_deps.ts index bc4523c9138..d666894dc46 100644 --- a/packages/core/schematics/migrations/signal-migration/src/analysis_deps.ts +++ b/packages/core/schematics/migrations/signal-migration/src/analysis_deps.ts @@ -7,15 +7,17 @@ */ import ts from 'typescript'; +import { + NgCompiler, + DtsMetadataReader, + MetadataReader, + PartialEvaluator, + TypeScriptReflectionHost, + ResourceLoader, + ReferenceEmitter, + TemplateTypeChecker, +} from '@angular/compiler-cli/private/migrations'; -import {DtsMetadataReader, MetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; - -import {ResourceLoader} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; -import {ReferenceEmitter} from '@angular/compiler-cli/src/ngtsc/imports'; -import {TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; import {ProgramInfo} from '../../../utils/tsurge/program_info'; /** diff --git a/packages/core/schematics/migrations/signal-migration/src/cli.ts b/packages/core/schematics/migrations/signal-migration/src/cli.ts index 87cce1697fc..4dff2e0b009 100644 --- a/packages/core/schematics/migrations/signal-migration/src/cli.ts +++ b/packages/core/schematics/migrations/signal-migration/src/cli.ts @@ -8,10 +8,10 @@ import path from 'path'; +import {NodeJSFileSystem} from '@angular/compiler-cli'; import assert from 'assert'; import {SignalInputMigration} from './migration'; import {writeMigrationReplacements} from './write_replacements'; -import {NodeJSFileSystem} from '../../../../../compiler-cli'; main( path.resolve(process.argv[2]), diff --git a/packages/core/schematics/migrations/signal-migration/src/convert-input/convert_to_signal.ts b/packages/core/schematics/migrations/signal-migration/src/convert-input/convert_to_signal.ts index ce6c2dbc605..6da5c254d87 100644 --- a/packages/core/schematics/migrations/signal-migration/src/convert-input/convert_to_signal.ts +++ b/packages/core/schematics/migrations/signal-migration/src/convert-input/convert_to_signal.ts @@ -9,14 +9,13 @@ import assert from 'assert'; import ts from 'typescript'; -import {ConvertInputPreparation} from './prepare_and_check'; -import {DecoratorInputTransform} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; -import {removeFromUnionIfPossible} from '../utils/remove_from_union'; -import {MigrationResult} from '../result'; +import {DecoratorInputTransform, ImportManager} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo, projectFile, Replacement, TextUpdate} from '../../../../utils/tsurge'; import {insertPrecedingLine} from '../../../../utils/tsurge/helpers/ast/insert_preceding_line'; import {cutStringToLineLimit} from '../../../../utils/tsurge/helpers/string_manipulation/cut_string_line_length'; +import {MigrationResult} from '../result'; +import {removeFromUnionIfPossible} from '../utils/remove_from_union'; +import {ConvertInputPreparation} from './prepare_and_check'; // TODO: Consider initializations inside the constructor. Those are not migrated right now // though, as they are writes. diff --git a/packages/core/schematics/migrations/signal-migration/src/convert-input/prepare_and_check.ts b/packages/core/schematics/migrations/signal-migration/src/convert-input/prepare_and_check.ts index 630754f57ab..16715f526a3 100644 --- a/packages/core/schematics/migrations/signal-migration/src/convert-input/prepare_and_check.ts +++ b/packages/core/schematics/migrations/signal-migration/src/convert-input/prepare_and_check.ts @@ -7,15 +7,14 @@ */ import ts from 'typescript'; +import {NgCompilerOptions, Decorator} from '@angular/compiler-cli/private/migrations'; import {ExtractedInput} from '../input_detection/input_decorator'; import { FieldIncompatibility, FieldIncompatibilityReason, } from '../passes/problematic_patterns/incompatibility'; import {InputNode} from '../input_detection/input_node'; -import {Decorator} from '@angular/compiler-cli/src/ngtsc/reflection'; import assert from 'assert'; -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; /** * Interface describing analysis performed when the input diff --git a/packages/core/schematics/migrations/signal-migration/src/input_detection/input_decorator.ts b/packages/core/schematics/migrations/signal-migration/src/input_detection/input_decorator.ts index 2caf5406ddb..d589a75138f 100644 --- a/packages/core/schematics/migrations/signal-migration/src/input_detection/input_decorator.ts +++ b/packages/core/schematics/migrations/signal-migration/src/input_detection/input_decorator.ts @@ -8,34 +8,28 @@ import ts from 'typescript'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {parseDecoratorInputTransformFunction} from '@angular/compiler-cli/src/ngtsc/annotations/directive'; -import {FatalDiagnosticError} from '@angular/compiler-cli/src/ngtsc/diagnostics'; -import { - Reference, - ReferenceEmitKind, - ReferenceEmitter, -} from '@angular/compiler-cli/src/ngtsc/imports'; import { + ClassDeclaration, + CompilationMode, + Decorator, DecoratorInputTransform, DirectiveMeta, DtsMetadataReader, - InputMapping, -} from '@angular/compiler-cli/src/ngtsc/metadata'; -import { DynamicValue, + FatalDiagnosticError, + getAngularDecorators, + InputMapping, + parseDecoratorInputTransformFunction, PartialEvaluator, - ResolvedValueMap, -} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; -import { - ClassDeclaration, - Decorator, + Reference, + ReferenceEmitKind, + ReferenceEmitter, ReflectionHost, -} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {CompilationMode} from '@angular/compiler-cli/src/ngtsc/transform'; -import {MigrationHost} from '../migration_host'; -import {InputNode, isInputContainerNode} from '../input_detection/input_node'; + ResolvedValueMap, +} from '@angular/compiler-cli/private/migrations'; import {NULL_EXPR} from '../../../../../../compiler/src/output/output_ast'; +import {InputNode, isInputContainerNode} from '../input_detection/input_node'; +import {MigrationHost} from '../migration_host'; /** Metadata extracted of an input declaration (in `.ts` or `.d.ts` files). */ export interface ExtractedInput extends InputMapping { diff --git a/packages/core/schematics/migrations/signal-migration/src/migration.ts b/packages/core/schematics/migrations/signal-migration/src/migration.ts index 2c90858c072..e6dd85b6671 100644 --- a/packages/core/schematics/migrations/signal-migration/src/migration.ts +++ b/packages/core/schematics/migrations/signal-migration/src/migration.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ -import {AbsoluteFsPath, FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {AbsoluteFsPath, FileSystem} from '@angular/compiler-cli'; import {confirmAsSerializable, Serializable} from '../../../utils/tsurge/helpers/serializable'; -import {BaseProgramInfo, ProgramInfo} from '../../../utils/tsurge/program_info'; +import {ProgramInfo} from '../../../utils/tsurge/program_info'; import {TsurgeComplexMigration} from '../../../utils/tsurge/migration'; import {CompilationUnitData} from './batch/unit_data'; import {KnownInputs} from './input_detection/known_inputs'; diff --git a/packages/core/schematics/migrations/signal-migration/src/migration_host.ts b/packages/core/schematics/migrations/signal-migration/src/migration_host.ts index d867463044e..50d7035fd98 100644 --- a/packages/core/schematics/migrations/signal-migration/src/migration_host.ts +++ b/packages/core/schematics/migrations/signal-migration/src/migration_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; +import {NgCompilerOptions} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; import {ProgramInfo} from '../../../utils/tsurge'; import {MigrationConfig} from './migration_config'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/10_apply_import_manager.ts b/packages/core/schematics/migrations/signal-migration/src/passes/10_apply_import_manager.ts index 5587b45c2c7..4b9bff32167 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/10_apply_import_manager.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/10_apply_import_manager.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; +import {ImportManager} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; import {applyImportManagerChanges} from '../../../../utils/tsurge/helpers/apply_import_manager'; import {MigrationResult} from '../result'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/1_identify_inputs.ts b/packages/core/schematics/migrations/signal-migration/src/passes/1_identify_inputs.ts index 2cf9e8a9cab..488a7eb0bb7 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/1_identify_inputs.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/1_identify_inputs.ts @@ -8,10 +8,11 @@ import assert from 'assert'; import ts from 'typescript'; -import {ReferenceEmitter} from '@angular/compiler-cli/src/ngtsc/imports'; -import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +import { + DtsMetadataReader, + PartialEvaluator, + TypeScriptReflectionHost, +} from '@angular/compiler-cli/private/migrations'; import {extractDecoratorInput} from '../input_detection/input_decorator'; import {isInputContainerNode} from '../input_detection/input_node'; import {KnownInputs} from '../input_detection/known_inputs'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/2_find_source_file_references.ts b/packages/core/schematics/migrations/signal-migration/src/passes/2_find_source_file_references.ts index 91114ad68dc..9c75571639b 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/2_find_source_file_references.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/2_find_source_file_references.ts @@ -6,10 +6,12 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ResourceLoader} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import { + ResourceLoader, + PartialEvaluator, + ReflectionHost, + TemplateTypeChecker, +} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; import {KnownInputs} from '../input_detection/known_inputs'; import {MigrationResult} from '../result'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/3_check_incompatible_patterns.ts b/packages/core/schematics/migrations/signal-migration/src/passes/3_check_incompatible_patterns.ts index 8a3ff5a986f..98dfdddf086 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/3_check_incompatible_patterns.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/3_check_incompatible_patterns.ts @@ -7,12 +7,12 @@ */ import ts from 'typescript'; +import {getAngularDecorators} from '@angular/compiler-cli/private/migrations'; import {KnownInputs} from '../input_detection/known_inputs'; import {MigrationHost} from '../migration_host'; import {GroupedTsAstVisitor} from '../utils/grouped_ts_ast_visitor'; import {InheritanceGraph} from '../utils/inheritance_graph'; import {checkIncompatiblePatterns} from './problematic_patterns/common_incompatible_patterns'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; import {FieldIncompatibilityReason} from './problematic_patterns/incompatibility'; /** diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/4_check_inheritance.ts b/packages/core/schematics/migrations/signal-migration/src/passes/4_check_inheritance.ts index 15fc9529e65..ad6489cc8d6 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/4_check_inheritance.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/4_check_inheritance.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {MetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; +import {MetadataReader} from '@angular/compiler-cli/private/migrations'; import assert from 'assert'; import {KnownInputs} from '../input_detection/known_inputs'; import {InheritanceGraph} from '../utils/inheritance_graph'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/6_migrate_input_declarations.ts b/packages/core/schematics/migrations/signal-migration/src/passes/6_migrate_input_declarations.ts index ece8a5b46e2..0fc4508b7b5 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/6_migrate_input_declarations.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/6_migrate_input_declarations.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; +import {ImportManager} from '@angular/compiler-cli/private/migrations'; import assert from 'assert'; import ts from 'typescript'; -import {ProgramInfo, projectFile, Replacement, TextUpdate} from '../../../../utils/tsurge'; +import {ProgramInfo} from '../../../../utils/tsurge'; import {convertToSignalInput} from '../convert-input/convert_to_signal'; import {KnownInputs} from '../input_detection/known_inputs'; import {MigrationHost} from '../migration_host'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/9_migrate_ts_type_references.ts b/packages/core/schematics/migrations/signal-migration/src/passes/9_migrate_ts_type_references.ts index e24fdfc8644..a7c57884623 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/9_migrate_ts_type_references.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/9_migrate_ts_type_references.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; +import {ImportManager} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo} from '../../../../utils/tsurge'; import {migrateTypeScriptTypeReferences} from './reference_migration/migrate_ts_type_references'; import {ReferenceMigrationHost} from './reference_migration/reference_migration_host'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/check_inheritance.ts b/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/check_inheritance.ts index 95ac9860dc9..29dbc6f1f4a 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/check_inheritance.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/check_inheritance.ts @@ -6,9 +6,11 @@ * found in the LICENSE file at https://angular.dev/license */ -import {Reference} from '@angular/compiler-cli/src/ngtsc/imports'; -import {MetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {ClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; +import { + Reference, + MetadataReader, + ClassDeclaration, +} from '@angular/compiler-cli/private/migrations'; import assert from 'assert'; import ts from 'typescript'; import {getMemberName} from '../../utils/class_member_names'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/common_incompatible_patterns.ts b/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/common_incompatible_patterns.ts index 706f3043aad..4ce1c619428 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/common_incompatible_patterns.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/problematic_patterns/common_incompatible_patterns.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ -import {unwrapExpression} from '@angular/compiler-cli/src/ngtsc/annotations/common'; import assert from 'assert'; import ts from 'typescript'; +import {unwrapExpression} from '@angular/compiler-cli/private/migrations'; import {ClassIncompatibilityReason} from './incompatibility'; import {SpyOnFieldPattern} from '../../pattern_advisors/spy_on_pattern'; import {getMemberName} from '../../utils/class_member_names'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_migration/migrate_ts_type_references.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_migration/migrate_ts_type_references.ts index 08031f47aba..f1b4d1510cc 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/reference_migration/migrate_ts_type_references.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/reference_migration/migrate_ts_type_references.ts @@ -7,9 +7,9 @@ */ import ts from 'typescript'; +import {ImportManager} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo, projectFile, Replacement, TextUpdate} from '../../../../../utils/tsurge'; import assert from 'assert'; -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; import {isTsClassTypeReference, Reference} from '../reference_resolution/reference_kinds'; import {ReferenceMigrationHost} from './reference_migration_host'; import {ClassFieldDescriptor} from '../reference_resolution/known_fields'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_host_references.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_host_references.ts index 57dcaa83f34..05ba2e7e300 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_host_references.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_host_references.ts @@ -6,10 +6,13 @@ * found in the LICENSE file at https://angular.dev/license */ -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {unwrapExpression} from '@angular/compiler-cli/src/ngtsc/annotations/common'; -import {ReflectionHost, reflectObjectLiteral} from '@angular/compiler-cli/src/ngtsc/reflection'; import ts from 'typescript'; +import { + getAngularDecorators, + unwrapExpression, + ReflectionHost, + reflectObjectLiteral, +} from '@angular/compiler-cli/private/migrations'; import { AST, ParseLocation, diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_template_references.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_template_references.ts index d5d7ba786aa..48ac15c2bf8 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_template_references.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/identify_template_references.ts @@ -6,16 +6,20 @@ * found in the LICENSE file at https://angular.dev/license */ -import {TmplAstNode} from '@angular/compiler'; -import {ResourceLoader} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {extractTemplate} from '@angular/compiler-cli/src/ngtsc/annotations/component/src/resources'; -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; -import {ClassDeclaration, ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {CompilationMode} from '@angular/compiler-cli/src/ngtsc/transform'; -import {OptimizeFor, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; import ts from 'typescript'; + +import {TmplAstNode} from '@angular/compiler'; +import {absoluteFrom, OptimizeFor} from '@angular/compiler-cli'; +import { + NgCompilerOptions, + ResourceLoader, + extractTemplate, + PartialEvaluator, + ClassDeclaration, + ReflectionHost, + CompilationMode, + TemplateTypeChecker, +} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo, projectFile} from '../../../../../utils/tsurge'; import {TemplateReferenceVisitor} from './template_reference_visitor'; import {attemptExtractTemplateDefinition} from '../../utils/extract_template'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/index.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/index.ts index 06b8d667974..70ce43aa3f5 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/index.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/index.ts @@ -6,11 +6,13 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ResourceLoader} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; import ts from 'typescript'; +import { + ResourceLoader, + ReflectionHost, + PartialEvaluator, + TemplateTypeChecker, +} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo, projectFile} from '../../../../../utils/tsurge'; import {isInputContainerNode} from '../../input_detection/input_node'; import {DebugElementComponentInstance} from '../../pattern_advisors/debug_element_component_instance'; diff --git a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/template_reference_visitor.ts b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/template_reference_visitor.ts index 07c4c8af4f5..3cf46f20cf6 100644 --- a/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/template_reference_visitor.ts +++ b/packages/core/schematics/migrations/signal-migration/src/passes/reference_resolution/template_reference_visitor.ts @@ -8,7 +8,7 @@ import ts from 'typescript'; -import {SymbolKind, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; +import {SymbolKind, TemplateTypeChecker} from '@angular/compiler-cli/private/migrations'; import { AST, Binary, diff --git a/packages/core/schematics/migrations/signal-migration/src/phase_analysis.ts b/packages/core/schematics/migrations/signal-migration/src/phase_analysis.ts index af805908643..20a5fb5e3bd 100644 --- a/packages/core/schematics/migrations/signal-migration/src/phase_analysis.ts +++ b/packages/core/schematics/migrations/signal-migration/src/phase_analysis.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {isShim} from '@angular/compiler-cli/src/ngtsc/shims'; +import {isShim} from '@angular/compiler-cli/private/migrations'; import {AnalysisProgramInfo} from './analysis_deps'; import {KnownInputs} from './input_detection/known_inputs'; import {MigrationHost} from './migration_host'; diff --git a/packages/core/schematics/migrations/signal-migration/src/phase_migrate.ts b/packages/core/schematics/migrations/signal-migration/src/phase_migrate.ts index 23120a14a90..c977462e804 100644 --- a/packages/core/schematics/migrations/signal-migration/src/phase_migrate.ts +++ b/packages/core/schematics/migrations/signal-migration/src/phase_migrate.ts @@ -6,13 +6,13 @@ * found in the LICENSE file at https://angular.dev/license */ +import {ImportManager} from '@angular/compiler-cli/private/migrations'; import {AnalysisProgramInfo} from './analysis_deps'; import {KnownInputs} from './input_detection/known_inputs'; import {MigrationHost} from './migration_host'; import {pass6__migrateInputDeclarations} from './passes/6_migrate_input_declarations'; import {MigrationResult} from './result'; import {pass10_applyImportManager} from './passes/10_apply_import_manager'; -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; import {InputDescriptor} from './utils/input_id'; import {ReferenceMigrationHost} from './passes/reference_migration/reference_migration_host'; import {pass5__migrateTypeScriptReferences} from './passes/5_migrate_ts_references'; diff --git a/packages/core/schematics/migrations/signal-migration/src/utils/extract_template.ts b/packages/core/schematics/migrations/signal-migration/src/utils/extract_template.ts index 760332d5ada..b1c9189aed7 100644 --- a/packages/core/schematics/migrations/signal-migration/src/utils/extract_template.ts +++ b/packages/core/schematics/migrations/signal-migration/src/utils/extract_template.ts @@ -7,13 +7,15 @@ */ import ts from 'typescript'; -import {ReflectionHost, reflectObjectLiteral} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {getAngularDecorators, ResourceLoader} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {PartialEvaluator} from '@angular/compiler-cli/src/ngtsc/partial_evaluator'; import { + getAngularDecorators, + PartialEvaluator, + ReflectionHost, + reflectObjectLiteral, + ResourceLoader, ExternalTemplateDeclaration, InlineTemplateDeclaration, -} from '@angular/compiler-cli/src/ngtsc/annotations/component/src/resources'; +} from '@angular/compiler-cli/private/migrations'; /** * Attempts to extract the `TemplateDefinition` for the given diff --git a/packages/core/schematics/migrations/signal-migration/src/write_replacements.ts b/packages/core/schematics/migrations/signal-migration/src/write_replacements.ts index e7934167c14..1f15efb2717 100644 --- a/packages/core/schematics/migrations/signal-migration/src/write_replacements.ts +++ b/packages/core/schematics/migrations/signal-migration/src/write_replacements.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ -import {applyTextUpdates, Replacement} from '../../../utils/tsurge/replacement'; +import {AbsoluteFsPath, getFileSystem} from '@angular/compiler-cli'; import {groupReplacementsByFile} from '../../../utils/tsurge/helpers/group_replacements'; -import {AbsoluteFsPath, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {applyTextUpdates, Replacement} from '../../../utils/tsurge/replacement'; /** Applies the migration result and applies it to the file system. */ export function writeMigrationReplacements( diff --git a/packages/core/schematics/migrations/signal-migration/test/BUILD.bazel b/packages/core/schematics/migrations/signal-migration/test/BUILD.bazel index d35eeb28391..e4645f32e53 100644 --- a/packages/core/schematics/migrations/signal-migration/test/BUILD.bazel +++ b/packages/core/schematics/migrations/signal-migration/test/BUILD.bazel @@ -110,8 +110,6 @@ ts_project( testonly = True, srcs = ["migration_spec.ts"], deps = [ - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/core/schematics/migrations/signal-migration/src", "//packages/core/schematics/utils/tsurge", ], diff --git a/packages/core/schematics/migrations/signal-migration/test/migration_spec.ts b/packages/core/schematics/migrations/signal-migration/test/migration_spec.ts index 8992b0f13e9..7ff396e32f2 100644 --- a/packages/core/schematics/migrations/signal-migration/test/migration_spec.ts +++ b/packages/core/schematics/migrations/signal-migration/test/migration_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {runTsurgeMigration} from '../../../utils/tsurge/testing'; import {SignalInputMigration} from '../src/migration'; import {setupTsurgeJasmineHelpers} from '../../../utils/tsurge/testing/jasmine'; diff --git a/packages/core/schematics/migrations/signal-queries-migration/BUILD.bazel b/packages/core/schematics/migrations/signal-queries-migration/BUILD.bazel index c21ff59bd98..8ed5d388b8a 100644 --- a/packages/core/schematics/migrations/signal-queries-migration/BUILD.bazel +++ b/packages/core/schematics/migrations/signal-queries-migration/BUILD.bazel @@ -15,11 +15,6 @@ ts_project( "//packages/compiler", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/directive", - "//packages/compiler-cli/src/ngtsc/diagnostics", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/migrations/signal-migration/src", "//packages/core/schematics/utils/tsurge", ], @@ -35,7 +30,6 @@ ts_project( ":migration", "//:node_modules/typescript", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/core/schematics/utils/tsurge", ], ) diff --git a/packages/core/schematics/migrations/signal-queries-migration/identify_queries.ts b/packages/core/schematics/migrations/signal-queries-migration/identify_queries.ts index 59cb39db019..401afcad447 100644 --- a/packages/core/schematics/migrations/signal-queries-migration/identify_queries.ts +++ b/packages/core/schematics/migrations/signal-queries-migration/identify_queries.ts @@ -6,19 +6,20 @@ * found in the LICENSE file at https://angular.dev/license */ -import {PartialEvaluator} from '@angular/compiler-cli/private/migrations'; +import {R3QueryMetadata} from '@angular/compiler'; import { + Decorator, + FatalDiagnosticError, + PartialEvaluator, + ReflectionHost, + extractDecoratorQueryMetadata, getAngularDecorators, queryDecoratorNames, -} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {extractDecoratorQueryMetadata} from '@angular/compiler-cli/src/ngtsc/annotations/directive'; -import {Decorator, ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; -import {R3QueryMetadata} from '@angular/compiler'; import {ProgramInfo} from '../../utils/tsurge'; import {ClassFieldUniqueKey} from '../signal-migration/src/passes/reference_resolution/known_fields'; import {getUniqueIDForClassProperty} from './field_tracking'; -import {FatalDiagnosticError} from '@angular/compiler-cli/src/ngtsc/diagnostics'; /** Type describing an extracted decorator query that can be migrated. */ export interface ExtractedQuery { diff --git a/packages/core/schematics/migrations/signal-queries-migration/migration.spec.ts b/packages/core/schematics/migrations/signal-queries-migration/migration.spec.ts index 93f017b285e..6dd3919aaa0 100644 --- a/packages/core/schematics/migrations/signal-queries-migration/migration.spec.ts +++ b/packages/core/schematics/migrations/signal-queries-migration/migration.spec.ts @@ -7,13 +7,13 @@ */ import {absoluteFrom} from '@angular/compiler-cli'; -import {runTsurgeMigration} from '../../utils/tsurge/testing'; -import {SignalQueriesMigration} from './migration'; -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import {diffText} from '../../utils/tsurge/testing/diff'; -import {dedent} from '../../utils/tsurge/testing/dedent'; -import {setupTsurgeJasmineHelpers} from '../../utils/tsurge/testing/jasmine'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import ts from 'typescript'; +import {runTsurgeMigration} from '../../utils/tsurge/testing'; +import {dedent} from '../../utils/tsurge/testing/dedent'; +import {diffText} from '../../utils/tsurge/testing/diff'; +import {setupTsurgeJasmineHelpers} from '../../utils/tsurge/testing/jasmine'; +import {SignalQueriesMigration} from './migration'; interface TestCase { id: string; diff --git a/packages/core/schematics/migrations/signal-queries-migration/migration.ts b/packages/core/schematics/migrations/signal-queries-migration/migration.ts index 59c9d9d9aab..a95d2d1fd95 100644 --- a/packages/core/schematics/migrations/signal-queries-migration/migration.ts +++ b/packages/core/schematics/migrations/signal-queries-migration/migration.ts @@ -6,9 +6,13 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ImportManager, PartialEvaluator} from '@angular/compiler-cli/private/migrations'; -import {getAngularDecorators, QueryFunctionName} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; +import { + ImportManager, + PartialEvaluator, + getAngularDecorators, + QueryFunctionName, + TypeScriptReflectionHost, +} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; import { confirmAsSerializable, diff --git a/packages/core/schematics/migrations/signal-queries-migration/query_api_names.ts b/packages/core/schematics/migrations/signal-queries-migration/query_api_names.ts index 2cb7e1fa83b..8fb635ae773 100644 --- a/packages/core/schematics/migrations/signal-queries-migration/query_api_names.ts +++ b/packages/core/schematics/migrations/signal-queries-migration/query_api_names.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {QueryFunctionName} from '@angular/compiler-cli/src/ngtsc/annotations'; +import {QueryFunctionName} from '@angular/compiler-cli/private/migrations'; /** Converts an initializer query API name to its decorator-equivalent. */ export function queryFunctionNameToDecorator(name: QueryFunctionName): string { diff --git a/packages/core/schematics/ng-generate/cleanup-unused-imports/BUILD.bazel b/packages/core/schematics/ng-generate/cleanup-unused-imports/BUILD.bazel index 1cf5e04c91c..41167564e4a 100644 --- a/packages/core/schematics/ng-generate/cleanup-unused-imports/BUILD.bazel +++ b/packages/core/schematics/ng-generate/cleanup-unused-imports/BUILD.bazel @@ -20,7 +20,6 @@ ts_project( "//:node_modules/typescript", "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/core:api", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", "//packages/core/schematics/utils/tsurge/helpers/angular_devkit", diff --git a/packages/core/schematics/ng-generate/cleanup-unused-imports/unused_imports_migration.ts b/packages/core/schematics/ng-generate/cleanup-unused-imports/unused_imports_migration.ts index 504d2637066..a5f24922ee8 100644 --- a/packages/core/schematics/ng-generate/cleanup-unused-imports/unused_imports_migration.ts +++ b/packages/core/schematics/ng-generate/cleanup-unused-imports/unused_imports_migration.ts @@ -17,8 +17,7 @@ import { TsurgeFunnelMigration, } from '../../utils/tsurge'; import {ErrorCode, FileSystem, ngErrorCode} from '@angular/compiler-cli'; -import {DiagnosticCategoryLabel} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {ImportManager} from '@angular/compiler-cli/private/migrations'; +import {DiagnosticCategoryLabel, ImportManager} from '@angular/compiler-cli/private/migrations'; import {applyImportManagerChanges} from '../../utils/tsurge/helpers/apply_import_manager'; /** Data produced by the migration for each compilation unit. */ diff --git a/packages/core/schematics/ng-generate/output-migration/BUILD.bazel b/packages/core/schematics/ng-generate/output-migration/BUILD.bazel index 12c47d2d7d0..378875901db 100644 --- a/packages/core/schematics/ng-generate/output-migration/BUILD.bazel +++ b/packages/core/schematics/ng-generate/output-migration/BUILD.bazel @@ -18,7 +18,6 @@ ts_project( srcs = glob(["**/*.ts"]), deps = [ "//:node_modules/@angular-devkit/schematics", - "//packages/compiler-cli/src/ngtsc/file_system", "//packages/core/schematics/migrations/output-migration:migration", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", diff --git a/packages/core/schematics/ng-generate/route-lazy-loading/BUILD.bazel b/packages/core/schematics/ng-generate/route-lazy-loading/BUILD.bazel index 1e3e4365623..fc7154ee6e9 100644 --- a/packages/core/schematics/ng-generate/route-lazy-loading/BUILD.bazel +++ b/packages/core/schematics/ng-generate/route-lazy-loading/BUILD.bazel @@ -19,8 +19,6 @@ ts_project( "//:node_modules/@angular-devkit/schematics", "//:node_modules/typescript", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/reflection", "//packages/core/schematics/utils", ], ) diff --git a/packages/core/schematics/ng-generate/route-lazy-loading/to-lazy-routes.ts b/packages/core/schematics/ng-generate/route-lazy-loading/to-lazy-routes.ts index af9d305d13d..0f8a8fd93c5 100644 --- a/packages/core/schematics/ng-generate/route-lazy-loading/to-lazy-routes.ts +++ b/packages/core/schematics/ng-generate/route-lazy-loading/to-lazy-routes.ts @@ -8,10 +8,7 @@ import ts from 'typescript'; -import { - ReflectionHost, - TypeScriptReflectionHost, -} from '@angular/compiler-cli/src/ngtsc/reflection/index'; +import {ReflectionHost, TypeScriptReflectionHost} from '@angular/compiler-cli/private/migrations'; import {ChangeTracker, PendingChange} from '../../utils/change_tracker'; import {findClassDeclaration} from '../../utils/typescript/class_declaration'; diff --git a/packages/core/schematics/ng-generate/route-lazy-loading/util.ts b/packages/core/schematics/ng-generate/route-lazy-loading/util.ts index c0802bb4aef..cf1bd7021c2 100644 --- a/packages/core/schematics/ng-generate/route-lazy-loading/util.ts +++ b/packages/core/schematics/ng-generate/route-lazy-loading/util.ts @@ -7,8 +7,7 @@ */ import ts from 'typescript'; -import {findAngularDecorator} from '@angular/compiler-cli/src/ngtsc/annotations'; -import {ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection/index'; +import {findAngularDecorator, ReflectionHost} from '@angular/compiler-cli/private/migrations'; import {findLiteralProperty} from '../../utils/typescript/property_name'; /** diff --git a/packages/core/schematics/ng-generate/self-closing-tags-migration/BUILD.bazel b/packages/core/schematics/ng-generate/self-closing-tags-migration/BUILD.bazel index aebd297e712..33bdaf9064a 100644 --- a/packages/core/schematics/ng-generate/self-closing-tags-migration/BUILD.bazel +++ b/packages/core/schematics/ng-generate/self-closing-tags-migration/BUILD.bazel @@ -17,7 +17,7 @@ ts_project( srcs = glob(["**/*.ts"]), deps = [ "//:node_modules/@angular-devkit/schematics", - "//packages/compiler-cli/src/ngtsc/file_system", + "//packages/compiler-cli/private", "//packages/core/schematics/migrations/self-closing-tags-migration:migration", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", diff --git a/packages/core/schematics/ng-generate/signal-input-migration/BUILD.bazel b/packages/core/schematics/ng-generate/signal-input-migration/BUILD.bazel index 8c00a79e2ea..eaef10c9d67 100644 --- a/packages/core/schematics/ng-generate/signal-input-migration/BUILD.bazel +++ b/packages/core/schematics/ng-generate/signal-input-migration/BUILD.bazel @@ -18,7 +18,7 @@ ts_project( srcs = glob(["**/*.ts"]), deps = [ "//:node_modules/@angular-devkit/schematics", - "//packages/compiler-cli/src/ngtsc/file_system", + "//packages/compiler-cli/private", "//packages/core/schematics/migrations/signal-migration/src", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", diff --git a/packages/core/schematics/ng-generate/signal-queries-migration/BUILD.bazel b/packages/core/schematics/ng-generate/signal-queries-migration/BUILD.bazel index 464c7a3b396..4b975b47006 100644 --- a/packages/core/schematics/ng-generate/signal-queries-migration/BUILD.bazel +++ b/packages/core/schematics/ng-generate/signal-queries-migration/BUILD.bazel @@ -18,7 +18,7 @@ ts_project( srcs = glob(["**/*.ts"]), deps = [ "//:node_modules/@angular-devkit/schematics", - "//packages/compiler-cli/src/ngtsc/file_system", + "//packages/compiler-cli/private", "//packages/core/schematics/migrations/signal-queries-migration:migration", "//packages/core/schematics/utils", "//packages/core/schematics/utils/tsurge", diff --git a/packages/core/schematics/utils/BUILD.bazel b/packages/core/schematics/utils/BUILD.bazel index ff9dae1b892..1e02805732c 100644 --- a/packages/core/schematics/utils/BUILD.bazel +++ b/packages/core/schematics/utils/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( "//:node_modules/@angular-devkit/schematics", "//:node_modules/typescript", "//packages/compiler", + "//packages/compiler-cli", "//packages/compiler-cli/private", - "//packages/compiler-cli/src/ngtsc/file_system", ], ) diff --git a/packages/core/schematics/utils/ng_component_template.ts b/packages/core/schematics/utils/ng_component_template.ts index c22847a8abb..a183e06b8bd 100644 --- a/packages/core/schematics/utils/ng_component_template.ts +++ b/packages/core/schematics/utils/ng_component_template.ts @@ -7,11 +7,11 @@ */ import ts from 'typescript'; +import {AbsoluteFsPath, getFileSystem} from '@angular/compiler-cli'; import {extractAngularClassMetadata} from './extract_metadata'; import {computeLineStartsMap, getLineAndCharacterFromPosition} from './line_mappings'; import {getPropertyNameText} from './typescript/property_name'; -import {AbsoluteFsPath, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; export interface ResolvedTemplate { /** Class declaration that contains this template. */ diff --git a/packages/core/schematics/utils/tsurge/BUILD.bazel b/packages/core/schematics/utils/tsurge/BUILD.bazel index 7973b7b2af2..318e6bd43e3 100644 --- a/packages/core/schematics/utils/tsurge/BUILD.bazel +++ b/packages/core/schematics/utils/tsurge/BUILD.bazel @@ -19,12 +19,6 @@ ts_project( "//:node_modules/magic-string", "//:node_modules/typescript", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/core", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", - "//packages/compiler-cli/src/ngtsc/shims", - "//packages/compiler-cli/src/ngtsc/translator", - "//packages/compiler-cli/src/ngtsc/util", + "//packages/compiler-cli/private", ], ) diff --git a/packages/core/schematics/utils/tsurge/base_migration.ts b/packages/core/schematics/utils/tsurge/base_migration.ts index 0163fab0c33..72029455b01 100644 --- a/packages/core/schematics/utils/tsurge/base_migration.ts +++ b/packages/core/schematics/utils/tsurge/base_migration.ts @@ -6,8 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {NgCompilerOptions, FileSystem} from '@angular/compiler-cli/private/migrations'; import {createBaseProgramInfo, getProgramInfoFromBaseInfo} from './helpers/create_program'; import {Serializable} from './helpers/serializable'; import {ProgramInfo} from './program_info'; diff --git a/packages/core/schematics/utils/tsurge/executors/analyze_exec.ts b/packages/core/schematics/utils/tsurge/executors/analyze_exec.ts index 15a8161e9e7..4c504d87bae 100644 --- a/packages/core/schematics/utils/tsurge/executors/analyze_exec.ts +++ b/packages/core/schematics/utils/tsurge/executors/analyze_exec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NodeJSFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {NodeJSFileSystem} from '@angular/compiler-cli'; import {TsurgeMigration} from '../migration'; import {Serializable} from '../helpers/serializable'; diff --git a/packages/core/schematics/utils/tsurge/executors/migrate_exec.ts b/packages/core/schematics/utils/tsurge/executors/migrate_exec.ts index cd460747b31..32c7503311b 100644 --- a/packages/core/schematics/utils/tsurge/executors/migrate_exec.ts +++ b/packages/core/schematics/utils/tsurge/executors/migrate_exec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {AbsoluteFsPath, NodeJSFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {AbsoluteFsPath, NodeJSFileSystem} from '@angular/compiler-cli'; import {TsurgeMigration} from '../migration'; import {Replacement} from '../replacement'; diff --git a/packages/core/schematics/utils/tsurge/helpers/apply_import_manager.ts b/packages/core/schematics/utils/tsurge/helpers/apply_import_manager.ts index 5e2a14c8877..1f6fdc49b30 100644 --- a/packages/core/schematics/utils/tsurge/helpers/apply_import_manager.ts +++ b/packages/core/schematics/utils/tsurge/helpers/apply_import_manager.ts @@ -7,8 +7,8 @@ */ import ts from 'typescript'; -import {ImportManager} from '@angular/compiler-cli/src/ngtsc/translator'; -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {ImportManager} from '@angular/compiler-cli/private/migrations'; import {Replacement, TextUpdate} from '../replacement'; import {projectFile} from '../project_paths'; import {ProgramInfo} from '../program_info'; diff --git a/packages/core/schematics/utils/tsurge/helpers/ast/BUILD.bazel b/packages/core/schematics/utils/tsurge/helpers/ast/BUILD.bazel index cceaca40845..13c9f2c3e6e 100644 --- a/packages/core/schematics/utils/tsurge/helpers/ast/BUILD.bazel +++ b/packages/core/schematics/utils/tsurge/helpers/ast/BUILD.bazel @@ -8,15 +8,7 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/annotations/common", - "//packages/compiler-cli/src/ngtsc/annotations/component", - "//packages/compiler-cli/src/ngtsc/core:api", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/partial_evaluator", - "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/ngtsc/transform", - "//packages/compiler-cli/src/ngtsc/typecheck/api", + "//packages/compiler-cli/private", "//packages/core/schematics/utils/tsurge", ], ) diff --git a/packages/core/schematics/utils/tsurge/helpers/create_program.ts b/packages/core/schematics/utils/tsurge/helpers/create_program.ts index 79e86b10e64..fe5725693bc 100644 --- a/packages/core/schematics/utils/tsurge/helpers/create_program.ts +++ b/packages/core/schematics/utils/tsurge/helpers/create_program.ts @@ -6,15 +6,14 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions, UnifiedModulesHost} from '@angular/compiler-cli/src/ngtsc/core/api'; +import {absoluteFrom, FileSystem, NgtscCompilerHost, setFileSystem} from '@angular/compiler-cli'; import { - absoluteFrom, - FileSystem, - NgtscCompilerHost, - setFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {isShim} from '@angular/compiler-cli/src/ngtsc/shims'; -import {getRootDirs} from '@angular/compiler-cli/src/ngtsc/util/src/typescript'; + NgCompilerOptions, + UnifiedModulesHost, + isShim, + getRootDirs, +} from '@angular/compiler-cli/private/migrations'; + import {BaseProgramInfo, ProgramInfo} from '../program_info'; import {google3UsePlainTsProgramIfNoKnownAngularOption, isGoogle3} from './google3/detection'; import {createNgtscProgram} from './ngtsc_program'; diff --git a/packages/core/schematics/utils/tsurge/helpers/ngtsc_program.ts b/packages/core/schematics/utils/tsurge/helpers/ngtsc_program.ts index 281cbd255c9..e7896c30a17 100644 --- a/packages/core/schematics/utils/tsurge/helpers/ngtsc_program.ts +++ b/packages/core/schematics/utils/tsurge/helpers/ngtsc_program.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {NgtscProgram} from '@angular/compiler-cli/src/ngtsc/program'; -import {ParsedConfiguration} from '@angular/compiler-cli/src/perform_compile'; +import {NgtscProgram, ParsedConfiguration} from '@angular/compiler-cli'; +import {NgCompilerOptions} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; import {BaseProgramInfo} from '../program_info'; import {defaultMigrationTsOptions} from './ts_program'; diff --git a/packages/core/schematics/utils/tsurge/helpers/ts_parse_config.ts b/packages/core/schematics/utils/tsurge/helpers/ts_parse_config.ts index ad6318bc20b..59a052d7671 100644 --- a/packages/core/schematics/utils/tsurge/helpers/ts_parse_config.ts +++ b/packages/core/schematics/utils/tsurge/helpers/ts_parse_config.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ParsedConfiguration, readConfiguration} from '@angular/compiler-cli/src/perform_compile'; -import {FileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {ParsedConfiguration, readConfiguration} from '@angular/compiler-cli'; +import {FileSystem} from '@angular/compiler-cli/private/migrations'; /** Code of the error raised by TypeScript when a tsconfig doesn't match any files. */ const NO_INPUTS_ERROR_CODE = 18003; diff --git a/packages/core/schematics/utils/tsurge/helpers/ts_program.ts b/packages/core/schematics/utils/tsurge/helpers/ts_program.ts index de045026f2f..123c164297e 100644 --- a/packages/core/schematics/utils/tsurge/helpers/ts_program.ts +++ b/packages/core/schematics/utils/tsurge/helpers/ts_program.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {ParsedConfiguration} from '@angular/compiler-cli/src/perform_compile'; +import {ParsedConfiguration} from '@angular/compiler-cli'; +import {NgCompilerOptions} from '@angular/compiler-cli/private/migrations'; import ts from 'typescript'; import {BaseProgramInfo} from '../program_info'; diff --git a/packages/core/schematics/utils/tsurge/program_info.ts b/packages/core/schematics/utils/tsurge/program_info.ts index cae91b12de6..5539ef46f92 100644 --- a/packages/core/schematics/utils/tsurge/program_info.ts +++ b/packages/core/schematics/utils/tsurge/program_info.ts @@ -6,11 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ -import {NgCompilerOptions} from '@angular/compiler-cli/src/ngtsc/core/api'; -import {AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system'; - import ts from 'typescript'; -import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; +import {AbsoluteFsPath} from '@angular/compiler-cli'; +import {NgCompiler, NgCompilerOptions} from '@angular/compiler-cli/private/migrations'; /** * Base information for a TypeScript project, including an instantiated diff --git a/packages/core/schematics/utils/tsurge/project_paths.ts b/packages/core/schematics/utils/tsurge/project_paths.ts index 4b802a4614f..79ae9ee4222 100644 --- a/packages/core/schematics/utils/tsurge/project_paths.ts +++ b/packages/core/schematics/utils/tsurge/project_paths.ts @@ -11,7 +11,7 @@ import { FileSystem, getFileSystem, isLocalRelativePath, -} from '@angular/compiler-cli/src/ngtsc/file_system'; +} from '@angular/compiler-cli'; import ts from 'typescript'; import {ProgramInfo} from './program_info'; diff --git a/packages/core/schematics/utils/tsurge/test/BUILD.bazel b/packages/core/schematics/utils/tsurge/test/BUILD.bazel index 7cf12f4e1de..115cc60fc72 100644 --- a/packages/core/schematics/utils/tsurge/test/BUILD.bazel +++ b/packages/core/schematics/utils/tsurge/test/BUILD.bazel @@ -9,11 +9,7 @@ ts_project( deps = [ "//:node_modules/typescript", "//packages/compiler-cli", - "//packages/compiler-cli/src/ngtsc/annotations", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/metadata", - "//packages/compiler-cli/src/ngtsc/reflection", + "//packages/compiler-cli/private", "//packages/core/schematics/utils/tsurge", ], ) @@ -26,8 +22,7 @@ ts_project( ), deps = [ ":migration_lib", - "//packages/compiler-cli/src/ngtsc/file_system", - "//packages/compiler-cli/src/ngtsc/file_system/testing", + "//packages/compiler-cli/private", "//packages/core/schematics/utils/tsurge", ], ) diff --git a/packages/core/schematics/utils/tsurge/test/g3_target_detection.spec.ts b/packages/core/schematics/utils/tsurge/test/g3_target_detection.spec.ts index 0f6b0569197..c97faf8cff4 100644 --- a/packages/core/schematics/utils/tsurge/test/g3_target_detection.spec.ts +++ b/packages/core/schematics/utils/tsurge/test/g3_target_detection.spec.ts @@ -6,11 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import { - initMockFileSystem, - MockFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; +import {initMockFileSystem, MockFileSystem} from '@angular/compiler-cli/private/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; import {OutputMigration} from './output_migration'; describe('google3 target detection', () => { diff --git a/packages/core/schematics/utils/tsurge/test/output_helpers.ts b/packages/core/schematics/utils/tsurge/test/output_helpers.ts index 3969cdf3113..a1c65383c2e 100644 --- a/packages/core/schematics/utils/tsurge/test/output_helpers.ts +++ b/packages/core/schematics/utils/tsurge/test/output_helpers.ts @@ -6,14 +6,16 @@ * found in the LICENSE file at https://angular.dev/license */ -import path from 'path'; -import {UniqueID} from '../helpers/unique_id'; import ts from 'typescript'; +import { + DtsMetadataReader, + ClassDeclaration, + ReflectionHost, + getAngularDecorators, + Reference, +} from '@angular/compiler-cli/private/migrations'; import {ProgramInfo} from '../program_info'; -import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {ClassDeclaration, ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {Reference} from '@angular/compiler-cli/src/ngtsc/imports'; -import {getAngularDecorators} from '@angular/compiler-cli/src/ngtsc/annotations'; +import {UniqueID} from '../helpers/unique_id'; import {projectFile} from '../project_paths'; export type OutputID = UniqueID<'output-node'>; diff --git a/packages/core/schematics/utils/tsurge/test/output_migration.spec.ts b/packages/core/schematics/utils/tsurge/test/output_migration.spec.ts index 39a766243ab..8000a174d8a 100644 --- a/packages/core/schematics/utils/tsurge/test/output_migration.spec.ts +++ b/packages/core/schematics/utils/tsurge/test/output_migration.spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; -import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; +import {absoluteFrom} from '@angular/compiler-cli'; +import {initMockFileSystem} from '@angular/compiler-cli/private/testing'; import {runTsurgeMigration} from '../testing'; import {OutputMigration} from './output_migration'; diff --git a/packages/core/schematics/utils/tsurge/test/output_migration.ts b/packages/core/schematics/utils/tsurge/test/output_migration.ts index 00296110d75..2beed8729fe 100644 --- a/packages/core/schematics/utils/tsurge/test/output_migration.ts +++ b/packages/core/schematics/utils/tsurge/test/output_migration.ts @@ -6,9 +6,11 @@ * found in the LICENSE file at https://angular.dev/license */ -import {DtsMetadataReader} from '@angular/compiler-cli/src/ngtsc/metadata'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {confirmAsSerializable, Serializable} from '../helpers/serializable'; +import { + DtsMetadataReader, + TypeScriptReflectionHost, +} from '@angular/compiler-cli/private/migrations'; +import {confirmAsSerializable} from '../helpers/serializable'; import {TsurgeComplexMigration} from '../migration'; import {ProgramInfo} from '../program_info'; import {Replacement, TextUpdate} from '../replacement'; diff --git a/packages/core/schematics/utils/tsurge/testing/run_single.ts b/packages/core/schematics/utils/tsurge/testing/run_single.ts index def19e1544f..d1188e1dca2 100644 --- a/packages/core/schematics/utils/tsurge/testing/run_single.ts +++ b/packages/core/schematics/utils/tsurge/testing/run_single.ts @@ -6,13 +6,9 @@ * found in the LICENSE file at https://angular.dev/license */ +import {absoluteFrom, AbsoluteFsPath, getFileSystem} from '@angular/compiler-cli'; +import {MockFileSystem} from '@angular/compiler-cli/private/testing'; import {TsurgeFunnelMigration, TsurgeMigration} from '../migration'; -import {MockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import { - absoluteFrom, - AbsoluteFsPath, - getFileSystem, -} from '@angular/compiler-cli/src/ngtsc/file_system'; import {groupReplacementsByFile} from '../helpers/group_replacements'; import {applyTextUpdates} from '../replacement'; import ts from 'typescript'; diff --git a/packages/core/schematics/utils/tsurge/testing/test_run.ts b/packages/core/schematics/utils/tsurge/testing/test_run.ts index 3be526ce6f9..e55ffe660e3 100644 --- a/packages/core/schematics/utils/tsurge/testing/test_run.ts +++ b/packages/core/schematics/utils/tsurge/testing/test_run.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import {MockFileSystem} from '../../../../../compiler-cli/src/ngtsc/file_system/testing'; +import {MockFileSystem} from '@angular/compiler-cli/private/testing'; /** Type describing results of a Tsurge migration test run. */ export interface TestRun { diff --git a/packages/core/test/acceptance/authoring/BUILD.bazel b/packages/core/test/acceptance/authoring/BUILD.bazel index 0d52482b5fc..577de26a587 100644 --- a/packages/core/test/acceptance/authoring/BUILD.bazel +++ b/packages/core/test/acceptance/authoring/BUILD.bazel @@ -24,10 +24,7 @@ ts_project( srcs = ["authoring_test_compiler.ts"], deps = [ "//:node_modules/typescript", - "//packages/compiler-cli/src/ngtsc/imports", - "//packages/compiler-cli/src/ngtsc/partial_evaluator", - "//packages/compiler-cli/src/ngtsc/reflection", - "//packages/compiler-cli/src/ngtsc/transform/jit", + "//packages/compiler-cli/private", ], ) diff --git a/packages/core/test/acceptance/authoring/authoring_test_compiler.ts b/packages/core/test/acceptance/authoring/authoring_test_compiler.ts index efd4a14b50a..4a0c188d6cd 100644 --- a/packages/core/test/acceptance/authoring/authoring_test_compiler.ts +++ b/packages/core/test/acceptance/authoring/authoring_test_compiler.ts @@ -6,9 +6,11 @@ * found in the LICENSE file at https://angular.dev/license */ -import {ImportedSymbolsTracker} from '@angular/compiler-cli/src/ngtsc/imports'; -import {TypeScriptReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import {getInitializerApiJitTransform} from '@angular/compiler-cli/src/ngtsc/transform/jit'; +import { + ImportedSymbolsTracker, + TypeScriptReflectionHost, + getInitializerApiJitTransform, +} from '@angular/compiler-cli/private/testing'; import fs from 'fs'; import path from 'path'; import ts from 'typescript';