From 8d7f1098d818191898d5ce7a031e4d256d2bc35c Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Sat, 25 Sep 2021 15:10:26 +0200 Subject: [PATCH] refactor: make all imports compatible with ESM/CJS output. (#43431) As outlined in the previous commit which enabled the `esModuleInterop` TypeScript compiler option, we need to update all namespace imports for `typescript` to default imports. This is needed to allow for TypeScript to be imported at runtime from an ES module. Similar changes are needed for modules like `semver` where the types incorrectly suggest named exports that will not exist at runtime when imported from ESM. This commit refactors all imports to match with the lint rule we have configured in the previous commit. See the previous commit for more details on why certain imports have been changed. A special case are the imports to `@babel/core` and `@babel/types`. For these a special interop is needed as both default imports, or named imports break the other module format. e.g default imports would work well for ESM, but it breaks for CJS. For CJS, the named imports would only work, but in ESM, only the default export exist. We work around this for now until the devmode is using ESM as well (which would be consistent with prodmode and gives us more valuable test results). More details on the interop can be found in the `babel_core.ts` files (two interops are needed for both localize/or the compiler-cli). PR Close #43431 --- package.json | 1 - packages/bazel/src/ngc-wrapped/index.ts | 2 +- .../bazel/test/ngc-wrapped/test_support.ts | 2 +- .../generate-locales-tool/cldr-data.ts | 4 +- packages/compiler-cli/BUILD.bazel | 1 - .../compiler-cli/linker/babel/BUILD.bazel | 1 - .../linker/babel/src/ast/babel_ast_factory.ts | 3 +- .../linker/babel/src/ast/babel_ast_host.ts | 3 +- .../linker/babel/src/babel_core.ts | 57 ++++++++++++++++++ .../babel/src/babel_declaration_scope.ts | 3 +- .../linker/babel/src/babel_plugin.ts | 3 +- .../linker/babel/src/es2015_linker_plugin.ts | 4 +- .../linker/babel/test/BUILD.bazel | 2 - .../babel/test/ast/babel_ast_factory_spec.ts | 9 ++- .../babel/test/ast/babel_ast_host_spec.ts | 2 +- .../test/babel_declaration_scope_spec.ts | 4 +- .../linker/babel/test/babel_plugin_spec.ts | 2 +- .../babel/test/es2015_linker_plugin_spec.ts | 3 +- .../src/ast/typescript/typescript_ast_host.ts | 2 +- .../partial_linker_selector.ts | 12 ++-- .../linker/test/ast/ast_value_spec.ts | 2 +- .../typescript/typescript_ast_host_spec.ts | 2 +- .../emit_scopes/emit_scope_spec.ts | 2 +- .../emit_scopes/iief_emit_scope_spec.ts | 2 +- .../test/file_linker/file_linker_spec.ts | 2 +- .../linker/test/file_linker/helpers.ts | 2 +- .../partial_linker_selector_spec.ts | 10 ++-- .../test/file_linker/translator_spec.ts | 2 +- .../ngcc/src/analysis/decoration_analyzer.ts | 2 +- .../ngcc/src/analysis/migration_host.ts | 2 +- .../module_with_providers_analyzer.ts | 2 +- .../src/analysis/ngcc_references_registry.ts | 2 +- .../ngcc/src/analysis/ngcc_trait_compiler.ts | 2 +- .../analysis/private_declarations_analyzer.ts | 2 +- .../src/analysis/switch_marker_analyzer.ts | 2 +- .../compiler-cli/ngcc/src/analysis/types.ts | 2 +- .../ngcc/src/command_line_options.ts | 4 +- .../dependencies/commonjs_dependency_host.ts | 2 +- .../src/dependencies/esm_dependency_host.ts | 2 +- .../src/dependencies/umd_dependency_host.ts | 2 +- .../ngcc/src/execution/cluster/master.ts | 2 +- .../execution/cluster/package_json_updater.ts | 2 +- .../ngcc/src/execution/cluster/utils.ts | 2 +- .../ngcc/src/execution/cluster/worker.ts | 2 +- .../src/execution/create_compile_function.ts | 2 +- .../ngcc/src/host/commonjs_host.ts | 2 +- .../ngcc/src/host/commonjs_umd_utils.ts | 2 +- .../ngcc/src/host/delegating_host.ts | 2 +- .../ngcc/src/host/esm2015_host.ts | 2 +- .../compiler-cli/ngcc/src/host/esm5_host.ts | 2 +- .../compiler-cli/ngcc/src/host/ngcc_host.ts | 2 +- .../compiler-cli/ngcc/src/host/umd_host.ts | 2 +- packages/compiler-cli/ngcc/src/host/utils.ts | 2 +- .../ngcc/src/migrations/migration.ts | 2 +- .../missing_injectable_migration.ts | 2 +- .../migrations/undecorated_child_migration.ts | 2 +- .../undecorated_parent_migration.ts | 2 +- .../compiler-cli/ngcc/src/migrations/utils.ts | 2 +- .../ngcc/src/packages/bundle_program.ts | 2 +- .../ngcc/src/packages/configuration.ts | 5 +- .../ngcc/src/packages/entry_point.ts | 2 +- .../ngcc/src/packages/entry_point_bundle.ts | 2 +- .../ngcc/src/packages/ngcc_compiler_host.ts | 2 +- .../packages/patch_ts_expando_initializer.ts | 2 +- .../ngcc/src/packages/source_file_cache.ts | 2 +- .../ngcc/src/packages/transformer.ts | 2 +- .../rendering/commonjs_rendering_formatter.ts | 2 +- .../ngcc/src/rendering/dts_renderer.ts | 2 +- .../src/rendering/esm5_rendering_formatter.ts | 2 +- .../src/rendering/esm_rendering_formatter.ts | 2 +- .../ngcc/src/rendering/renderer.ts | 2 +- .../ngcc/src/rendering/rendering_formatter.ts | 2 +- .../ngcc/src/rendering/source_maps.ts | 13 ++-- .../src/rendering/umd_rendering_formatter.ts | 2 +- .../compiler-cli/ngcc/src/rendering/utils.ts | 2 +- packages/compiler-cli/ngcc/src/utils.ts | 2 +- .../test/analysis/decoration_analyzer_spec.ts | 2 +- .../ngcc/test/analysis/migration_host_spec.ts | 2 +- .../module_with_providers_analyzer_spec.ts | 2 +- .../private_declarations_analyzer_spec.ts | 2 +- .../test/analysis/references_registry_spec.ts | 2 +- .../commonjs_dependency_host_spec.ts | 2 +- .../dependencies/dts_dependency_host_spec.ts | 2 +- .../dependencies/esm_dependency_host_spec.ts | 2 +- .../dependencies/umd_dependency_host_spec.ts | 2 +- .../test/execution/cluster/executor_spec.ts | 2 +- .../cluster/package_json_updater_spec.ts | 2 +- .../test/execution/cluster/worker_spec.ts | 2 +- .../compiler-cli/ngcc/test/helpers/utils.ts | 2 +- .../ngcc/test/host/commonjs_host_spec.ts | 2 +- .../host/esm2015_host_import_helper_spec.ts | 2 +- .../ngcc/test/host/esm2015_host_spec.ts | 2 +- .../test/host/esm5_host_import_helper_spec.ts | 2 +- .../ngcc/test/host/esm5_host_spec.ts | 2 +- .../ngcc/test/host/umd_host_spec.ts | 2 +- packages/compiler-cli/ngcc/test/host/util.ts | 2 +- .../ngcc/test/integration/util.ts | 2 +- .../missing_injectable_migration_spec.ts | 2 +- .../undecorated_parent_migration_spec.ts | 2 +- .../test/packages/source_file_cache_spec.ts | 2 +- .../commonjs_rendering_formatter_spec.ts | 2 +- .../ngcc/test/rendering/dts_renderer_spec.ts | 6 +- .../esm5_rendering_formatter_spec.ts | 2 +- .../rendering/esm_rendering_formatter_spec.ts | 2 +- .../ngcc/test/rendering/renderer_spec.ts | 23 +++---- .../rendering/umd_rendering_formatter_spec.ts | 2 +- packages/compiler-cli/ngcc/test/utils_spec.ts | 2 +- packages/compiler-cli/package.json | 1 - .../src/diagnostics/translate_diagnostics.ts | 2 +- packages/compiler-cli/src/main.ts | 2 +- .../src/metadata/bundle_index_host.ts | 2 +- packages/compiler-cli/src/metadata/bundler.ts | 2 +- .../compiler-cli/src/metadata/collector.ts | 2 +- .../compiler-cli/src/metadata/evaluator.ts | 2 +- packages/compiler-cli/src/metadata/symbols.ts | 2 +- .../src/ngtsc/annotations/src/component.ts | 2 +- .../src/ngtsc/annotations/src/diagnostics.ts | 2 +- .../src/ngtsc/annotations/src/directive.ts | 2 +- .../src/ngtsc/annotations/src/injectable.ts | 2 +- .../src/ngtsc/annotations/src/metadata.ts | 2 +- .../src/ngtsc/annotations/src/ng_module.ts | 2 +- .../src/ngtsc/annotations/src/pipe.ts | 2 +- .../src/ngtsc/annotations/src/util.ts | 2 +- .../ngtsc/annotations/test/component_spec.ts | 2 +- .../annotations/test/diagnostics_spec.ts | 2 +- .../ngtsc/annotations/test/directive_spec.ts | 2 +- .../ngtsc/annotations/test/metadata_spec.ts | 2 +- .../ngtsc/annotations/test/ng_module_spec.ts | 2 +- .../src/ngtsc/annotations/test/util_spec.ts | 2 +- .../src/ngtsc/core/api/src/adapter.ts | 2 +- .../src/ngtsc/core/api/src/interfaces.ts | 2 +- .../src/ngtsc/core/api/src/options.ts | 2 +- .../src/ngtsc/core/src/compiler.ts | 2 +- .../compiler-cli/src/ngtsc/core/src/host.ts | 2 +- .../src/ngtsc/core/test/compiler_test.ts | 2 +- .../src/ngtsc/cycles/src/analyzer.ts | 2 +- .../src/ngtsc/cycles/src/imports.ts | 2 +- .../src/ngtsc/cycles/test/analyzer_spec.ts | 2 +- .../src/ngtsc/cycles/test/imports_spec.ts | 2 +- .../src/ngtsc/cycles/test/util.ts | 2 +- .../src/ngtsc/diagnostics/src/error.ts | 2 +- .../src/ngtsc/entry_point/src/generator.ts | 2 +- .../entry_point/src/private_export_checker.ts | 2 +- .../ngtsc/file_system/src/compiler_host.ts | 2 +- .../src/ngtsc/file_system/src/helpers.ts | 2 +- .../src/ngtsc/file_system/src/logical.ts | 2 +- .../src/ngtsc/file_system/src/util.ts | 2 +- .../file_system/test/compiler_host_spec.ts | 2 +- .../file_system/testing/src/test_helper.ts | 2 +- .../src/ngtsc/imports/src/alias.ts | 2 +- .../src/ngtsc/imports/src/default.ts | 2 +- .../src/ngtsc/imports/src/emitter.ts | 2 +- .../src/ngtsc/imports/src/find_export.ts | 2 +- .../src/ngtsc/imports/src/references.ts | 2 +- .../src/ngtsc/imports/src/resolver.ts | 2 +- .../src/ngtsc/imports/test/default_spec.ts | 2 +- .../src/ngtsc/imports/test/emitter_spec.ts | 2 +- .../compiler-cli/src/ngtsc/incremental/api.ts | 2 +- .../incremental/semantic_graph/src/api.ts | 2 +- .../semantic_graph/src/type_parameters.ts | 2 +- .../incremental/src/dependency_tracking.ts | 2 +- .../src/ngtsc/incremental/src/incremental.ts | 2 +- .../src/ngtsc/incremental/src/state.ts | 2 +- .../src/ngtsc/incremental/src/strategy.ts | 2 +- .../src/ngtsc/indexer/test/util.ts | 2 +- .../src/ngtsc/metadata/src/api.ts | 2 +- .../src/ngtsc/metadata/src/dts.ts | 2 +- .../ngtsc/metadata/src/resource_registry.ts | 2 +- .../src/ngtsc/metadata/src/util.ts | 2 +- .../src/ngtsc/metadata/test/dts_spec.ts | 2 +- .../ngtsc/partial_evaluator/src/builtin.ts | 2 +- .../partial_evaluator/src/diagnostics.ts | 2 +- .../ngtsc/partial_evaluator/src/dynamic.ts | 2 +- .../ngtsc/partial_evaluator/src/interface.ts | 2 +- .../partial_evaluator/src/interpreter.ts | 2 +- .../src/ngtsc/partial_evaluator/src/result.ts | 2 +- .../ngtsc/partial_evaluator/src/ts_helpers.ts | 2 +- .../test/diagnostics_spec.ts | 2 +- .../partial_evaluator/test/evaluator_spec.ts | 2 +- .../src/ngtsc/partial_evaluator/test/utils.ts | 2 +- packages/compiler-cli/src/ngtsc/program.ts | 2 +- .../src/ngtsc/program_driver/src/api.ts | 2 +- .../src/ts_create_program_driver.ts | 2 +- .../src/ngtsc/reflection/src/host.ts | 2 +- .../src/ngtsc/reflection/src/type_to_value.ts | 2 +- .../src/ngtsc/reflection/src/typescript.ts | 2 +- .../src/ngtsc/reflection/src/util.ts | 2 +- .../src/ngtsc/reflection/test/ts_host_spec.ts | 2 +- .../src/ngtsc/resource/src/loader.ts | 2 +- .../src/ngtsc/scope/src/dependency.ts | 2 +- .../compiler-cli/src/ngtsc/scope/src/local.ts | 2 +- .../src/ngtsc/scope/src/typecheck.ts | 2 +- .../src/ngtsc/scope/test/dependency_spec.ts | 2 +- .../src/ngtsc/scope/test/local_spec.ts | 2 +- packages/compiler-cli/src/ngtsc/shims/api.ts | 2 +- .../src/ngtsc/shims/src/adapter.ts | 2 +- .../src/ngtsc/shims/src/expando.ts | 2 +- .../src/ngtsc/shims/src/factory_generator.ts | 2 +- .../src/ngtsc/shims/src/reference_tagger.ts | 2 +- .../src/ngtsc/shims/src/summary_generator.ts | 2 +- .../src/ngtsc/shims/test/adapter_spec.ts | 2 +- .../ngtsc/shims/test/reference_tagger_spec.ts | 2 +- .../compiler-cli/src/ngtsc/shims/test/util.ts | 2 +- .../src/ngtsc/sourcemaps/src/source_file.ts | 5 +- .../sourcemaps/src/source_file_loader.ts | 8 +-- .../test/source_file_loader_spec.ts | 12 ++-- .../src/ngtsc/switch/src/switch.ts | 2 +- .../ngtsc/testing/src/cached_source_files.ts | 2 +- .../src/ngtsc/testing/src/compiler_host.ts | 2 +- .../src/ngtsc/testing/src/utils.ts | 2 +- .../src/ngtsc/transform/src/alias.ts | 2 +- .../src/ngtsc/transform/src/api.ts | 2 +- .../src/ngtsc/transform/src/compilation.ts | 2 +- .../src/ngtsc/transform/src/declaration.ts | 2 +- .../src/ngtsc/transform/src/trait.ts | 2 +- .../src/ngtsc/transform/src/transform.ts | 2 +- .../src/ngtsc/transform/src/utils.ts | 2 +- .../ngtsc/translator/src/import_manager.ts | 2 +- .../src/ngtsc/translator/src/translator.ts | 1 - .../ngtsc/translator/src/type_translator.ts | 2 +- .../translator/src/typescript_ast_factory.ts | 2 +- .../translator/src/typescript_translator.ts | 2 +- .../test/typescript_ast_factory_spec.ts | 2 +- packages/compiler-cli/src/ngtsc/tsc_plugin.ts | 2 +- .../src/ngtsc/typecheck/api/api.ts | 2 +- .../src/ngtsc/typecheck/api/checker.ts | 2 +- .../src/ngtsc/typecheck/api/context.ts | 2 +- .../src/ngtsc/typecheck/api/scope.ts | 2 +- .../src/ngtsc/typecheck/api/symbols.ts | 2 +- .../typecheck/diagnostics/src/diagnostic.ts | 2 +- .../src/ngtsc/typecheck/diagnostics/src/id.ts | 2 +- .../src/ngtsc/typecheck/extended/api/api.ts | 2 +- .../extended/api/extended_template_checker.ts | 2 +- .../checks/invalid_banana_in_box/index.ts | 4 +- .../nullish_coalescing_not_nullable/index.ts | 2 +- .../extended/src/extended_template_checker.ts | 2 +- .../invalid_banana_in_box_spec.ts | 6 +- .../nullish_coalescing_not_nullable_spec.ts | 2 +- .../src/ngtsc/typecheck/src/checker.ts | 2 +- .../src/ngtsc/typecheck/src/comments.ts | 2 +- .../src/ngtsc/typecheck/src/completion.ts | 2 +- .../src/ngtsc/typecheck/src/context.ts | 2 +- .../src/ngtsc/typecheck/src/diagnostics.ts | 2 +- .../src/ngtsc/typecheck/src/dom.ts | 2 +- .../src/ngtsc/typecheck/src/environment.ts | 2 +- .../src/ngtsc/typecheck/src/expression.ts | 2 +- .../src/ngtsc/typecheck/src/oob.ts | 2 +- .../src/ngtsc/typecheck/src/shim.ts | 2 +- .../src/ngtsc/typecheck/src/source.ts | 2 +- .../src/ngtsc/typecheck/src/tcb_util.ts | 2 +- .../typecheck/src/template_symbol_builder.ts | 2 +- .../src/ngtsc/typecheck/src/ts_util.ts | 2 +- .../ngtsc/typecheck/src/type_check_block.ts | 2 +- .../ngtsc/typecheck/src/type_check_file.ts | 2 +- .../ngtsc/typecheck/src/type_constructor.ts | 2 +- .../src/ngtsc/typecheck/src/type_emitter.ts | 2 +- .../typecheck/src/type_parameter_emitter.ts | 2 +- .../ngtsc/typecheck/test/diagnostics_spec.ts | 2 +- .../src/ngtsc/typecheck/test/program_spec.ts | 2 +- .../test/type_checker__completion_spec.ts | 2 +- ...ecker__get_symbol_of_template_node_spec.ts | 2 +- .../typecheck/test/type_constructor_spec.ts | 2 +- .../test/type_parameter_emitter_spec.ts | 2 +- .../src/ngtsc/typecheck/testing/index.ts | 2 +- .../src/ngtsc/util/src/typescript.ts | 2 +- .../src/ngtsc/util/src/visitor.ts | 2 +- .../src/ngtsc/util/test/visitor_spec.ts | 2 +- packages/compiler-cli/src/perform_compile.ts | 2 +- packages/compiler-cli/src/perform_watch.ts | 2 +- packages/compiler-cli/src/tooling.ts | 2 +- packages/compiler-cli/src/transformers/api.ts | 2 +- .../src/transformers/compiler_host.ts | 2 +- .../downlevel_decorators_transform.ts | 2 +- .../src/transformers/entry_points.ts | 2 +- .../compiler-cli/src/transformers/i18n.ts | 2 +- .../src/transformers/inline_resources.ts | 2 +- .../src/transformers/lower_expressions.ts | 2 +- .../src/transformers/metadata_cache.ts | 2 +- .../src/transformers/metadata_reader.ts | 2 +- .../src/transformers/node_emitter.ts | 2 +- .../transformers/node_emitter_transform.ts | 2 +- .../patch_alias_reference_resolution.ts | 2 +- .../compiler-cli/src/transformers/program.ts | 2 +- .../src/transformers/r3_metadata_transform.ts | 2 +- .../src/transformers/r3_transform.ts | 2 +- .../compiler-cli/src/transformers/util.ts | 2 +- .../compiler-cli/src/typescript_support.ts | 2 +- .../compliance/linked/linked_compile_spec.ts | 3 +- .../compliance/test_helpers/compile_test.ts | 2 +- .../test/diagnostics/check_types_spec.ts | 2 +- .../test/metadata/bundler_spec.ts | 2 +- .../test/metadata/collector_spec.ts | 2 +- .../test/metadata/evaluator_spec.ts | 2 +- .../test/metadata/symbols_spec.ts | 2 +- .../test/metadata/typescript.mocks.ts | 2 +- packages/compiler-cli/test/mocks.ts | 2 +- packages/compiler-cli/test/ngc_spec.ts | 2 +- packages/compiler-cli/test/ngtsc/env.ts | 2 +- .../extended_template_diagnostics_spec.ts | 26 ++++---- .../test/ngtsc/incremental_typecheck_spec.ts | 2 +- .../compiler-cli/test/ngtsc/ngtsc_spec.ts | 2 +- .../compiler-cli/test/ngtsc/scope_spec.ts | 2 +- .../test/ngtsc/template_typecheck_spec.ts | 2 +- .../compiler-cli/test/perform_compile_spec.ts | 2 +- .../compiler-cli/test/perform_watch_spec.ts | 2 +- packages/compiler-cli/test/test_support.ts | 2 +- .../test/transformers/compiler_host_spec.ts | 2 +- .../downlevel_decorators_transform_spec.ts | 2 +- .../transformers/inline_resources_spec.ts | 2 +- .../transformers/lower_expressions_spec.ts | 2 +- .../test/transformers/metadata_reader_spec.ts | 2 +- .../test/transformers/node_emitter_spec.ts | 2 +- .../test/transformers/program_spec.ts | 2 +- .../r3_metadata_transform_spec.ts | 2 +- .../test/transformers/r3_transform_spec.ts | 2 +- packages/compiler/test/aot/compiler_spec.ts | 2 +- .../test/aot/static_symbol_resolver_spec.ts | 2 +- packages/compiler/test/aot/test_util.ts | 2 +- .../abstract-control-parent/util.ts | 2 +- .../index.ts | 2 +- .../activated-route-snapshot-fragment/util.ts | 2 +- .../can-activate-with-redirect-to/index.ts | 2 +- .../can-activate-with-redirect-to/util.ts | 2 +- .../migrations/dynamic-queries/index.ts | 2 +- .../migrations/dynamic-queries/util.ts | 2 +- .../activatedRouteSnapshotFragmentRule.ts | 2 +- .../google3/canActivateWithRedirectToRule.ts | 2 +- .../migrations/google3/dynamicQueriesRule.ts | 2 +- .../google3/explicitQueryTimingRule.ts | 2 +- .../google3/initialNavigationRule.ts | 2 +- .../google3/navigationExtrasOmissionsRule.ts | 2 +- .../google3/noMissingInjectableRule.ts | 2 +- .../noTemplateVariableAssignmentRule.ts | 2 +- .../relativeLinkResolutionDefaultRule.ts | 2 +- .../google3/rendererToRenderer2Rule.ts | 2 +- ...decoratedClassesWithDecoratedFieldsRule.ts | 2 +- .../migrations/google3/waitForAsyncRule.ts | 2 +- .../initial-navigation/collector.ts | 2 +- .../google3/tslint_update_recorder.ts | 2 +- .../migrations/initial-navigation/index.ts | 2 +- .../initial-navigation/transform.ts | 2 +- .../initial-navigation/update_recorder.ts | 2 +- .../migrations/initial-navigation/util.ts | 2 +- .../definition_collector.ts | 2 +- .../google3/tslint_update_recorder.ts | 2 +- .../migrations/missing-injectable/index.ts | 2 +- .../missing-injectable/providers_evaluator.ts | 2 +- .../missing-injectable/transform.ts | 2 +- .../missing-injectable/update_recorder.ts | 2 +- .../module-with-providers/collector.ts | 2 +- .../migrations/module-with-providers/index.ts | 2 +- .../module-with-providers/transform.ts | 2 +- .../migrations/module-with-providers/util.ts | 2 +- .../move-document/document_import_visitor.ts | 2 +- .../migrations/move-document/index.ts | 2 +- .../migrations/move-document/move-import.ts | 2 +- .../native-view-encapsulation/util.ts | 2 +- .../navigation-extras-omissions/index.ts | 2 +- .../navigation-extras-omissions/util.ts | 2 +- .../relative-link-resolution/collector.ts | 2 +- .../google3/tslint_update_recorder.ts | 2 +- .../relative-link-resolution/index.ts | 2 +- .../relative-link-resolution/transform.ts | 2 +- .../update_recorder.ts | 2 +- .../relative-link-resolution/util.ts | 2 +- .../renderer-to-renderer2/helpers.ts | 2 +- .../migrations/renderer-to-renderer2/index.ts | 2 +- .../renderer-to-renderer2/migration.ts | 2 +- .../migrations/renderer-to-renderer2/util.ts | 2 +- .../router-preserve-query-params/index.ts | 2 +- .../router-preserve-query-params/util.ts | 2 +- .../angular/directive_inputs.ts | 2 +- .../angular/ng_query_visitor.ts | 2 +- .../angular/query-definition.ts | 2 +- .../static-queries/angular/super_class.ts | 2 +- .../migrations/static-queries/index.ts | 2 +- .../template_strategy/template_strategy.ts | 2 +- .../declaration_usage_visitor.ts | 2 +- .../usage_strategy/super_class_context.ts | 2 +- .../usage_strategy/usage_strategy.ts | 2 +- .../migrations/static-queries/transform.ts | 2 +- .../google3/tslint_update_recorder.ts | 2 +- .../index.ts | 2 +- .../transform.ts | 2 +- .../update_recorder.ts | 2 +- .../create_ngc_program.ts | 2 +- .../convert_directive_metadata.ts | 2 +- .../decorator_rewrite/decorator_rewriter.ts | 2 +- .../import_rewrite_visitor.ts | 2 +- .../decorator_rewrite/source_file_exports.ts | 2 +- .../undecorated-classes-with-di/index.ts | 2 +- .../ng_declaration_collector.ts | 2 +- .../undecorated-classes-with-di/transform.ts | 2 +- .../update_recorder.ts | 2 +- .../migrations/wait-for-async/index.ts | 2 +- .../migrations/wait-for-async/util.ts | 2 +- .../migrations/xhr-factory/index.ts | 2 +- .../core/schematics/utils/import_manager.ts | 2 +- .../schematics/utils/ng_component_template.ts | 2 +- .../core/schematics/utils/ng_decorators.ts | 2 +- .../utils/tslint/tslint_html_source_file.ts | 2 +- .../utils/typescript/class_declaration.ts | 2 +- .../utils/typescript/compiler_host.ts | 2 +- .../schematics/utils/typescript/decorators.ts | 2 +- .../utils/typescript/find_base_classes.ts | 2 +- .../schematics/utils/typescript/functions.ts | 2 +- .../schematics/utils/typescript/imports.ts | 2 +- .../core/schematics/utils/typescript/nodes.ts | 2 +- .../utils/typescript/parse_tsconfig.ts | 2 +- .../utils/typescript/property_name.ts | 2 +- .../schematics/utils/typescript/symbol.ts | 2 +- packages/language-service/api.ts | 2 +- .../ivy/attribute_completions.ts | 2 +- packages/language-service/ivy/completions.ts | 2 +- packages/language-service/ivy/definitions.ts | 2 +- .../language-service/ivy/display_parts.ts | 2 +- packages/language-service/ivy/quick_info.ts | 2 +- .../ivy/references_and_rename.ts | 2 +- .../ivy/references_and_rename_utils.ts | 2 +- .../ivy/test/completions_spec.ts | 2 +- .../ivy/test/diagnostic_spec.ts | 18 +++--- .../ivy/test/ts_utils_spec.ts | 2 +- packages/language-service/ivy/ts_utils.ts | 2 +- packages/language-service/ivy/utils.ts | 2 +- packages/language-service/src/definitions.ts | 2 +- .../src/diagnostic_messages.ts | 2 +- packages/language-service/src/diagnostics.ts | 2 +- packages/language-service/src/hover.ts | 2 +- .../language-service/src/reflector_host.ts | 2 +- packages/language-service/src/symbols.ts | 2 +- packages/language-service/src/template.ts | 2 +- packages/language-service/src/types.ts | 2 +- .../src/typescript_symbols.ts | 2 +- .../language-service/test/completions_spec.ts | 2 +- .../language-service/test/definitions_spec.ts | 2 +- .../test/diagnostic_messages_spec.ts | 2 +- .../language-service/test/diagnostics_spec.ts | 2 +- .../test/expression_diagnostics_spec.ts | 2 +- packages/language-service/test/hover_spec.ts | 2 +- .../test/language_service_spec.ts | 2 +- packages/language-service/test/mocks.ts | 2 +- .../language-service/test/references_spec.ts | 2 +- .../test/reflector_host_spec.ts | 2 +- packages/language-service/test/test_utils.ts | 2 +- .../language-service/test/ts_plugin_spec.ts | 2 +- .../test/typescript_host_spec.ts | 2 +- .../test/typescript_symbols_spec.ts | 2 +- packages/language-service/test/utils_spec.ts | 2 +- packages/localize/package.json | 1 - packages/localize/tools/BUILD.bazel | 2 - packages/localize/tools/src/babel_core.ts | 60 +++++++++++++++++++ packages/localize/tools/src/extract/cli.ts | 4 +- .../localize/tools/src/extract/extraction.ts | 2 +- .../source_files/es2015_extract_plugin.ts | 5 +- .../source_files/es5_extract_plugin.ts | 5 +- packages/localize/tools/src/migrate/cli.ts | 4 +- .../localize/tools/src/source_file_utils.ts | 2 +- packages/localize/tools/src/translate/cli.ts | 4 +- .../source_files/es2015_translate_plugin.ts | 5 +- .../source_files/es5_translate_plugin.ts | 5 +- .../translate/source_files/locale_plugin.ts | 7 +-- .../source_file_translation_handler.ts | 5 +- packages/localize/tools/test/BUILD.bazel | 3 - .../source_files/es5_extract_plugin_spec.ts | 2 +- .../tools/test/source_file_utils_spec.ts | 57 +++++++++--------- .../es2015_translate_plugin_spec.ts | 2 +- .../source_files/es5_translate_plugin_spec.ts | 2 +- .../source_files/locale_plugin_spec.ts | 2 +- tools/contributing-stats/get-data.ts | 2 +- tools/symbol-extractor/symbol_extractor.ts | 2 +- .../requireInternalWithUnderscoreRule.ts | 2 +- 471 files changed, 691 insertions(+), 583 deletions(-) create mode 100644 packages/compiler-cli/linker/babel/src/babel_core.ts create mode 100644 packages/localize/tools/src/babel_core.ts diff --git a/package.json b/package.json index 6e933ef2b3e..9829c54549a 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@babel/preset-env": "7.10.2", "@babel/template": "7.8.6", "@babel/traverse": "7.8.6", - "@babel/types": "7.8.6", "@bazel/concatjs": "4.3.0", "@bazel/esbuild": "4.3.0", "@bazel/jasmine": "4.3.0", diff --git a/packages/bazel/src/ngc-wrapped/index.ts b/packages/bazel/src/ngc-wrapped/index.ts index 11993b5df90..6b83fd35d94 100644 --- a/packages/bazel/src/ngc-wrapped/index.ts +++ b/packages/bazel/src/ngc-wrapped/index.ts @@ -12,7 +12,7 @@ import {BazelOptions, CachedFileLoader, CompilerHost, constructManifest, debug, import * as fs from 'fs'; import * as path from 'path'; import * as tsickle from 'tsickle'; -import * as ts from 'typescript'; +import ts from 'typescript'; const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/; const NGC_GEN_FILES = /^(.*?)\.(ngfactory|ngsummary|ngstyle|shim\.ngstyle)(.*)$/; diff --git a/packages/bazel/test/ngc-wrapped/test_support.ts b/packages/bazel/test/ngc-wrapped/test_support.ts index 10159e6dbcb..ef1a990f00f 100644 --- a/packages/bazel/test/ngc-wrapped/test_support.ts +++ b/packages/bazel/test/ngc-wrapped/test_support.ts @@ -9,7 +9,7 @@ import {runOneBuild} from '@angular/bazel'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {createTsConfig} from './tsconfig_template'; diff --git a/packages/common/locales/generate-locales-tool/cldr-data.ts b/packages/common/locales/generate-locales-tool/cldr-data.ts index d865ceb6528..edc6b5beeb4 100644 --- a/packages/common/locales/generate-locales-tool/cldr-data.ts +++ b/packages/common/locales/generate-locales-tool/cldr-data.ts @@ -8,7 +8,7 @@ import {runfiles} from '@bazel/runfiles'; import {CldrStatic} from 'cldrjs'; -import {sync as globSync} from 'glob'; +import glob from 'glob'; // TypeScript doesn't allow us to import the default export without the `esModuleInterop`. We use // the NodeJS require function instead as specifying a custom tsconfig complicates the setup @@ -141,7 +141,7 @@ export class CldrData { */ private _readCldrDataFromRepository(): object[] { const jsonFiles = - CLDR_DATA_GLOBS.map(pattern => globSync(pattern, {cwd: this.cldrDataDir, absolute: true})) + CLDR_DATA_GLOBS.map(pattern => glob.sync(pattern, {cwd: this.cldrDataDir, absolute: true})) .reduce((acc, dataFiles) => [...acc, ...dataFiles], []); // Read the JSON for all determined CLDR json files. diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index 19d68a68018..ee603471958 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -42,7 +42,6 @@ esbuild( "@angular/compiler", "typescript", "@babel/core", - "@babel/types", "reflect-metadata", "minimist", "canonical-path", diff --git a/packages/compiler-cli/linker/babel/BUILD.bazel b/packages/compiler-cli/linker/babel/BUILD.bazel index b8798073d98..2e8c2f820fc 100644 --- a/packages/compiler-cli/linker/babel/BUILD.bazel +++ b/packages/compiler-cli/linker/babel/BUILD.bazel @@ -14,7 +14,6 @@ ts_library( "//packages/compiler-cli/src/ngtsc/logging", "//packages/compiler-cli/src/ngtsc/translator", "@npm//@babel/core", - "@npm//@babel/types", "@npm//@types/babel__core", "@npm//@types/babel__traverse", ], diff --git a/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts b/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts index 50c4c56e25f..87b23d748c9 100644 --- a/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts +++ b/packages/compiler-cli/linker/babel/src/ast/babel_ast_factory.ts @@ -5,10 +5,9 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as t from '@babel/types'; - import {assert} from '../../../../linker'; import {AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapRange, TemplateLiteral, VariableDeclarationType} from '../../../../src/ngtsc/translator'; +import {types as t} from '../babel_core'; /** * A Babel flavored implementation of the AstFactory. diff --git a/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts b/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts index 39490b7f4bd..a4fa385a5cd 100644 --- a/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts +++ b/packages/compiler-cli/linker/babel/src/ast/babel_ast_host.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import * as t from '@babel/types'; - import {assert, AstHost, FatalLinkerError, Range} from '../../../../linker'; +import {types as t} from '../babel_core'; /** * This implementation of `AstHost` is able to get information from Babel AST nodes. diff --git a/packages/compiler-cli/linker/babel/src/babel_core.ts b/packages/compiler-cli/linker/babel/src/babel_core.ts new file mode 100644 index 00000000000..b12b841bf82 --- /dev/null +++ b/packages/compiler-cli/linker/babel/src/babel_core.ts @@ -0,0 +1,57 @@ +/** + * @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.io/license + */ + +/** + * This is an interop file allowing for `@babel/core` to be imported in both CommonJS or + * ES module files. The `@babel/core` package needs some special treatment because: + * + * Using a default import does not with CommonJS because the `@babel/core` package does not + * expose a `default` export at runtime (because it sets the `_esModule` property that causes + * TS to not create the necessary interop `default` export). On the other side, when loaded + * as part of an ESM, NodeJS will make all of the exports available as default export. + * + * Using named import bindings (i.e. namespace import or actual named bindings) is not + * working well for ESM because as said before, NodeJS will make all of the exports available + * as the `default` export. Hence ESM that imports CJS, always should use the default import. + * + * There is no solution that would work for both CJS and ESM, so we need to use a custom interop + * that switches between the named exports or the default exports depending on what is available. + * This allows the code to run in both ESM (for production) and CJS (for development). + * + * TODO(devversion): remove this once devmode uses ESM as well. + */ + +// tslint:disable-next-line +import * as _babelNamespace from '@babel/core'; +// tslint:disable-next-line +import _babelDefault from '@babel/core'; + +const babel: typeof _babelNamespace = _babelDefault ?? _babelNamespace; + +// We create an alias of the `types` namespace so that we can re-export the +// types namespace. Preserving the namespace is important so that types +// can still be referenced using a qualified name. +import _typesNamespace = _babelNamespace.types; + +// If the default export is available, we use its `types` runtime value +// for the type namespace we re-export. This is a trick we use to preserve +// the namespace types, while changing the runtime value of the namespace. +// TS complains about us assigning to a namespace but this is legal at runtime. +if (_babelDefault !== undefined) { + // @ts-ignore + _typesNamespace = _babelDefault.types; +} + +export import types = _typesNamespace; +export type PluginObj = _babelNamespace.PluginObj; +export type ConfigAPI = _babelNamespace.ConfigAPI; +export type NodePath = _babelNamespace.NodePath; + +export const NodePath: typeof _babelNamespace.NodePath = babel.NodePath; +export const transformSync: typeof _babelNamespace.transformSync = babel.transformSync; +export const parse: typeof _babelNamespace.parse = babel.parse; diff --git a/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts b/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts index 5eb9d0cee31..e6e033566f2 100644 --- a/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts +++ b/packages/compiler-cli/linker/babel/src/babel_declaration_scope.ts @@ -6,10 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ import {NodePath, Scope} from '@babel/traverse'; -import * as t from '@babel/types'; import {DeclarationScope} from '../../../linker'; +import {types as t} from './babel_core'; + export type ConstantScopePath = NodePath; /** diff --git a/packages/compiler-cli/linker/babel/src/babel_plugin.ts b/packages/compiler-cli/linker/babel/src/babel_plugin.ts index 68013ee0d1d..ca8f1456ebb 100644 --- a/packages/compiler-cli/linker/babel/src/babel_plugin.ts +++ b/packages/compiler-cli/linker/babel/src/babel_plugin.ts @@ -5,12 +5,11 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {ConfigAPI, PluginObj} from '@babel/core'; - import {NodeJSFileSystem} from '../../../src/ngtsc/file_system'; import {ConsoleLogger, LogLevel} from '../../../src/ngtsc/logging'; import {LinkerOptions} from '../../src/file_linker/linker_options'; +import {ConfigAPI, PluginObj} from './babel_core'; import {createEs2015LinkerPlugin} from './es2015_linker_plugin'; /** diff --git a/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts b/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts index 11a647f0df4..cfe97b67100 100644 --- a/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts +++ b/packages/compiler-cli/linker/babel/src/es2015_linker_plugin.ts @@ -5,14 +5,14 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {PluginObj} from '@babel/core'; + import {NodePath} from '@babel/traverse'; -import * as t from '@babel/types'; import {FileLinker, isFatalLinkerError, LinkerEnvironment} from '../../../linker'; import {BabelAstFactory} from './ast/babel_ast_factory'; import {BabelAstHost} from './ast/babel_ast_host'; +import {PluginObj, types as t} from './babel_core'; import {BabelDeclarationScope, ConstantScopePath} from './babel_declaration_scope'; import {LinkerPluginOptions} from './linker_plugin_options'; diff --git a/packages/compiler-cli/linker/babel/test/BUILD.bazel b/packages/compiler-cli/linker/babel/test/BUILD.bazel index f1a48537c30..23261d5ac52 100644 --- a/packages/compiler-cli/linker/babel/test/BUILD.bazel +++ b/packages/compiler-cli/linker/babel/test/BUILD.bazel @@ -16,12 +16,10 @@ ts_library( "//packages/compiler-cli/src/ngtsc/file_system/testing", "//packages/compiler-cli/src/ngtsc/logging/testing", "//packages/compiler-cli/src/ngtsc/translator", - "@npm//@babel/core", "@npm//@babel/generator", "@npm//@babel/parser", "@npm//@babel/template", "@npm//@babel/traverse", - "@npm//@babel/types", "@npm//@types/babel__core", "@npm//@types/babel__generator", "@npm//@types/babel__template", diff --git a/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts b/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts index 950eafc40c1..ae290972716 100644 --- a/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts +++ b/packages/compiler-cli/linker/babel/test/ast/babel_ast_factory_spec.ts @@ -7,11 +7,16 @@ */ import {leadingComment} from '@angular/compiler'; import generate from '@babel/generator'; -import {expression, statement} from '@babel/template'; -import * as t from '@babel/types'; +import template from '@babel/template'; +import {types as t} from '../../src/babel_core'; import {BabelAstFactory} from '../../src/ast/babel_ast_factory'; +// Exposes shothands for the `expression` and `statement` +// methods exposed by `@babel/template`. +const expression = template.expression; +const statement = template.statement; + describe('BabelAstFactory', () => { let factory: BabelAstFactory; beforeEach(() => factory = new BabelAstFactory('/original.ts')); diff --git a/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts b/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts index 2540a6508dd..5e9e37c438c 100644 --- a/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts +++ b/packages/compiler-cli/linker/babel/test/ast/babel_ast_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as t from '@babel/types'; +import {types as t} from '../../src/babel_core'; import template from '@babel/template'; import {parse} from '@babel/parser'; import {BabelAstHost} from '../../src/ast/babel_ast_host'; diff --git a/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts b/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts index ee0ebb89d9c..c1d091d6e4c 100644 --- a/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts +++ b/packages/compiler-cli/linker/babel/test/babel_declaration_scope_spec.ts @@ -5,9 +5,11 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ + import {parse} from '@babel/parser'; import traverse, {NodePath} from '@babel/traverse'; -import * as t from '@babel/types'; + +import {types as t} from '../src/babel_core'; import {BabelDeclarationScope} from '../src/babel_declaration_scope'; describe('BabelDeclarationScope', () => { diff --git a/packages/compiler-cli/linker/babel/test/babel_plugin_spec.ts b/packages/compiler-cli/linker/babel/test/babel_plugin_spec.ts index 781cd3b8685..ce9d4c580c3 100644 --- a/packages/compiler-cli/linker/babel/test/babel_plugin_spec.ts +++ b/packages/compiler-cli/linker/babel/test/babel_plugin_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {transformSync} from '@babel/core'; +import {transformSync} from '../src/babel_core'; describe('default babel plugin entry-point', () => { it('should work as a Babel plugin using the module specifier', () => { diff --git a/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts b/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts index 92773e4a738..4edde04dae1 100644 --- a/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts +++ b/packages/compiler-cli/linker/babel/test/es2015_linker_plugin_spec.ts @@ -6,14 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ import * as o from '@angular/compiler/src/output/output_ast'; -import {NodePath, PluginObj, transformSync} from '@babel/core'; import generate from '@babel/generator'; -import * as t from '@babel/types'; import {FileLinker} from '../../../linker'; import {MockFileSystemNative} from '../../../src/ngtsc/file_system/testing'; import {MockLogger} from '../../../src/ngtsc/logging/testing'; import {PartialDirectiveLinkerVersion1} from '../../src/file_linker/partial_linkers/partial_directive_linker_1'; +import {NodePath, PluginObj, transformSync, types as t} from '../src/babel_core'; import {createEs2015LinkerPlugin} from '../src/es2015_linker_plugin'; describe('createEs2015LinkerPlugin()', () => { diff --git a/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts b/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts index 9b6bb9069ff..e5b7e52dd35 100644 --- a/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts +++ b/packages/compiler-cli/linker/src/ast/typescript/typescript_ast_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {FatalLinkerError} from '../../fatal_linker_error'; import {AstHost, Range} from '../ast_host'; diff --git a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts index ebf702694e9..8bfa59796fd 100644 --- a/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts +++ b/packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_linker_selector.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {intersects, Range, SemVer} from 'semver'; +import semver from 'semver'; import {AbsoluteFsPath} from '../../../../src/ngtsc/file_system'; import {Logger} from '../../../../src/ngtsc/logging'; @@ -36,7 +36,7 @@ export const declarationFunctions = [ ]; export interface LinkerRange { - range: Range; + range: semver.Range; linker: PartialLinker; } @@ -151,7 +151,7 @@ export class PartialLinkerSelector { const declarationRange = getRange('>=', minVersion); for (const {range: linkerRange, linker} of linkerRanges) { - if (intersects(declarationRange, linkerRange)) { + if (semver.intersects(declarationRange, linkerRange)) { return linker; } } @@ -183,9 +183,9 @@ export class PartialLinkerSelector { * @param versionStr the version given in the partial declaration * @returns A semver range for the provided `version` and comparator. */ -function getRange(comparator: '<='|'>=', versionStr: string): Range { - const version = new SemVer(versionStr); +function getRange(comparator: '<='|'>=', versionStr: string): semver.Range { + const version = new semver.SemVer(versionStr); // Wipe out any prerelease versions version.prerelease = []; - return new Range(`${comparator}${version.format()}`); + return new semver.Range(`${comparator}${version.format()}`); } diff --git a/packages/compiler-cli/linker/test/ast/ast_value_spec.ts b/packages/compiler-cli/linker/test/ast/ast_value_spec.ts index 2893e807229..52dfb84b40a 100644 --- a/packages/compiler-cli/linker/test/ast/ast_value_spec.ts +++ b/packages/compiler-cli/linker/test/ast/ast_value_spec.ts @@ -7,7 +7,7 @@ */ import {WrappedNodeExpr} from '@angular/compiler'; import {TypeScriptAstFactory} from '@angular/compiler-cli/src/ngtsc/translator'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {AstHost} from '../../src/ast/ast_host'; import {AstObject, AstValue} from '../../src/ast/ast_value'; diff --git a/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts b/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts index 1b840eee42a..29d066b1c90 100644 --- a/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts +++ b/packages/compiler-cli/linker/test/ast/typescript/typescript_ast_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptAstHost} from '../../../src/ast/typescript/typescript_ast_host'; describe('TypeScriptAstHost', () => { diff --git a/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts b/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts index c95c1ba52f5..63d32368b1a 100644 --- a/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts +++ b/packages/compiler-cli/linker/test/file_linker/emit_scopes/emit_scope_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import * as o from '@angular/compiler/src/output/output_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptAstFactory} from '../../../../src/ngtsc/translator'; import {EmitScope} from '../../../src/file_linker/emit_scopes/emit_scope'; diff --git a/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts b/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts index e8b787195fc..49d8635aea0 100644 --- a/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts +++ b/packages/compiler-cli/linker/test/file_linker/emit_scopes/iief_emit_scope_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import * as o from '@angular/compiler/src/output/output_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptAstFactory} from '../../../../src/ngtsc/translator'; import {IifeEmitScope} from '../../../src/file_linker/emit_scopes/iife_emit_scope'; diff --git a/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts b/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts index 40a9a0bd7ac..383821af3e9 100644 --- a/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts +++ b/packages/compiler-cli/linker/test/file_linker/file_linker_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import * as o from '@angular/compiler/src/output/output_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {MockFileSystemNative} from '../../../src/ngtsc/file_system/testing'; import {MockLogger} from '../../../src/ngtsc/logging/testing'; diff --git a/packages/compiler-cli/linker/test/file_linker/helpers.ts b/packages/compiler-cli/linker/test/file_linker/helpers.ts index 5faa908ce78..f3840ca5a67 100644 --- a/packages/compiler-cli/linker/test/file_linker/helpers.ts +++ b/packages/compiler-cli/linker/test/file_linker/helpers.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * A simple helper to render a TS Node as a string. diff --git a/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts b/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts index 2ede4a5d4a5..189715c0c99 100644 --- a/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts +++ b/packages/compiler-cli/linker/test/file_linker/partial_linkers/partial_linker_selector_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {Range} from 'semver'; +import semver from 'semver'; import {MockLogger} from '../../../../src/ngtsc/logging/testing'; import {PartialLinker} from '../../../src/file_linker/partial_linkers/partial_linker'; @@ -111,12 +111,12 @@ describe('PartialLinkerSelector', () => { function createSelector(unknownDeclarationVersionHandling: 'error'|'warn'|'ignore') { const linkerMap = new Map[]>(); linkerMap.set('declareA', [ - {range: new Range('<=12.0.0'), linker: linkerA}, - {range: new Range('<=13.0.0'), linker: linkerA2} + {range: new semver.Range('<=12.0.0'), linker: linkerA}, + {range: new semver.Range('<=13.0.0'), linker: linkerA2} ]); linkerMap.set('declareB', [ - {range: new Range('<=12.0.0'), linker: linkerB}, - {range: new Range('<=12.1.0'), linker: linkerB2}, + {range: new semver.Range('<=12.0.0'), linker: linkerB}, + {range: new semver.Range('<=12.1.0'), linker: linkerB2}, ]); return new PartialLinkerSelector(linkerMap, logger, unknownDeclarationVersionHandling); } diff --git a/packages/compiler-cli/linker/test/file_linker/translator_spec.ts b/packages/compiler-cli/linker/test/file_linker/translator_spec.ts index 233cd38e9a2..30f35b0c637 100644 --- a/packages/compiler-cli/linker/test/file_linker/translator_spec.ts +++ b/packages/compiler-cli/linker/test/file_linker/translator_spec.ts @@ -7,7 +7,7 @@ */ import * as o from '@angular/compiler'; import {ImportGenerator, NamedImport, TypeScriptAstFactory} from '@angular/compiler-cli/src/ngtsc/translator'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Translator} from '../../src/file_linker/translator'; import {generate} from './helpers'; diff --git a/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts index a15ece7d820..cf735d4cc12 100644 --- a/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts +++ b/packages/compiler-cli/ngcc/src/analysis/decoration_analyzer.ts @@ -7,7 +7,7 @@ */ import {ConstantPool} from '@angular/compiler'; import {NOOP_PERF_RECORDER} from '@angular/compiler-cli/src/ngtsc/perf'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ParsedConfiguration} from '../../..'; import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, PipeDecoratorHandler, ReferencesRegistry, ResourceLoader} from '../../../src/ngtsc/annotations'; diff --git a/packages/compiler-cli/ngcc/src/analysis/migration_host.ts b/packages/compiler-cli/ngcc/src/analysis/migration_host.ts index 60b6f89bd68..c039700dd41 100644 --- a/packages/compiler-cli/ngcc/src/analysis/migration_host.ts +++ b/packages/compiler-cli/ngcc/src/analysis/migration_host.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {MetadataReader} from '../../../src/ngtsc/metadata'; diff --git a/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts index 598823faea7..081af69a4a0 100644 --- a/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts +++ b/packages/compiler-cli/ngcc/src/analysis/module_with_providers_analyzer.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ReferencesRegistry} from '../../../src/ngtsc/annotations'; import {Reference} from '../../../src/ngtsc/imports'; diff --git a/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts b/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts index 198e5659b82..458bf946aa4 100644 --- a/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts +++ b/packages/compiler-cli/ngcc/src/analysis/ngcc_references_registry.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ReferencesRegistry} from '../../../src/ngtsc/annotations'; import {Reference} from '../../../src/ngtsc/imports'; import {Declaration, DeclarationNode, ReflectionHost} from '../../../src/ngtsc/reflection'; diff --git a/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts b/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts index 2edd9dc7370..038d52182f4 100644 --- a/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts +++ b/packages/compiler-cli/ngcc/src/analysis/ngcc_trait_compiler.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {IncrementalBuild} from '../../../src/ngtsc/incremental/api'; import {SemanticSymbol} from '../../../src/ngtsc/incremental/semantic_graph'; diff --git a/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts index 4dcbf9461cf..eba3a0da726 100644 --- a/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts +++ b/packages/compiler-cli/ngcc/src/analysis/private_declarations_analyzer.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {Declaration} from '../../../src/ngtsc/reflection'; diff --git a/packages/compiler-cli/ngcc/src/analysis/switch_marker_analyzer.ts b/packages/compiler-cli/ngcc/src/analysis/switch_marker_analyzer.ts index 7ec044ebe34..9a11e0992d4 100644 --- a/packages/compiler-cli/ngcc/src/analysis/switch_marker_analyzer.ts +++ b/packages/compiler-cli/ngcc/src/analysis/switch_marker_analyzer.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {NgccReflectionHost, SwitchableVariableDeclaration} from '../host/ngcc_host'; import {isWithinPackage} from './util'; diff --git a/packages/compiler-cli/ngcc/src/analysis/types.ts b/packages/compiler-cli/ngcc/src/analysis/types.ts index 228d3303bd8..cf6aa8add8a 100644 --- a/packages/compiler-cli/ngcc/src/analysis/types.ts +++ b/packages/compiler-cli/ngcc/src/analysis/types.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {ConstantPool} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reexport} from '../../../src/ngtsc/imports'; import {ClassDeclaration, Decorator} from '../../../src/ngtsc/reflection'; import {CompileResult} from '../../../src/ngtsc/transform'; diff --git a/packages/compiler-cli/ngcc/src/command_line_options.ts b/packages/compiler-cli/ngcc/src/command_line_options.ts index b423d127a8c..e0ceae5ab5e 100644 --- a/packages/compiler-cli/ngcc/src/command_line_options.ts +++ b/packages/compiler-cli/ngcc/src/command_line_options.ts @@ -6,7 +6,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as yargs from 'yargs'; +import yargs from 'yargs'; import {setFileSystem, NodeJSFileSystem} from '../../src/ngtsc/file_system'; import {ConsoleLogger, LogLevel} from '../../src/ngtsc/logging'; @@ -22,7 +22,7 @@ export function parseCommandLineOptions(args: string[]): NgccOptions { default: './node_modules', type: 'string', }) - .option('f', {alias: 'formats', hidden: true, array: true, type: 'string'}) + .option('f', {alias: 'formats', hidden: true, array: true, type: 'string'}) .option('p', { alias: 'properties', array: true, diff --git a/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts index ea57e6cbbd6..cbecba73888 100644 --- a/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts +++ b/packages/compiler-cli/ngcc/src/dependencies/commonjs_dependency_host.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {isRequireCall, isWildcardReexportStatement, RequireCall} from '../host/commonjs_umd_utils'; diff --git a/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts index f33c9f1f4c7..eeebce495a8 100644 --- a/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts +++ b/packages/compiler-cli/ngcc/src/dependencies/esm_dependency_host.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {DependencyHostBase} from './dependency_host'; import {ModuleResolver} from './module_resolver'; diff --git a/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts b/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts index 2274bbeffbf..8489cdeeaeb 100644 --- a/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts +++ b/packages/compiler-cli/ngcc/src/dependencies/umd_dependency_host.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {getImportsOfUmdModule, parseStatementForUmdModule} from '../host/umd_host'; diff --git a/packages/compiler-cli/ngcc/src/execution/cluster/master.ts b/packages/compiler-cli/ngcc/src/execution/cluster/master.ts index f8d8929757d..759e4f3dde0 100644 --- a/packages/compiler-cli/ngcc/src/execution/cluster/master.ts +++ b/packages/compiler-cli/ngcc/src/execution/cluster/master.ts @@ -8,7 +8,7 @@ /// -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {AbsoluteFsPath, PathManipulation} from '../../../../src/ngtsc/file_system'; import {Logger} from '../../../../src/ngtsc/logging'; diff --git a/packages/compiler-cli/ngcc/src/execution/cluster/package_json_updater.ts b/packages/compiler-cli/ngcc/src/execution/cluster/package_json_updater.ts index 7da2ea6b7c1..704c365a12a 100644 --- a/packages/compiler-cli/ngcc/src/execution/cluster/package_json_updater.ts +++ b/packages/compiler-cli/ngcc/src/execution/cluster/package_json_updater.ts @@ -8,7 +8,7 @@ /// -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {AbsoluteFsPath} from '../../../../src/ngtsc/file_system'; import {JsonObject} from '../../packages/entry_point'; diff --git a/packages/compiler-cli/ngcc/src/execution/cluster/utils.ts b/packages/compiler-cli/ngcc/src/execution/cluster/utils.ts index 7c0308e25e5..23e0aa4e486 100644 --- a/packages/compiler-cli/ngcc/src/execution/cluster/utils.ts +++ b/packages/compiler-cli/ngcc/src/execution/cluster/utils.ts @@ -8,7 +8,7 @@ /// -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {MessageFromWorker, MessageToWorker} from './api'; diff --git a/packages/compiler-cli/ngcc/src/execution/cluster/worker.ts b/packages/compiler-cli/ngcc/src/execution/cluster/worker.ts index 32b984b2ecd..512960e6fd4 100644 --- a/packages/compiler-cli/ngcc/src/execution/cluster/worker.ts +++ b/packages/compiler-cli/ngcc/src/execution/cluster/worker.ts @@ -7,7 +7,7 @@ */ /// -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {Logger} from '../../../../src/ngtsc/logging'; import {CreateCompileFn} from '../api'; diff --git a/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts b/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts index fb528a8ea02..b5f9b0fea98 100644 --- a/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts +++ b/packages/compiler-cli/ngcc/src/execution/create_compile_function.ts @@ -6,7 +6,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {replaceTsWithNgInErrors} from '../../../src/ngtsc/diagnostics'; import {FileSystem} from '../../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/ngcc/src/host/commonjs_host.ts b/packages/compiler-cli/ngcc/src/host/commonjs_host.ts index 3cbd94bfe93..18a34459f4b 100644 --- a/packages/compiler-cli/ngcc/src/host/commonjs_host.ts +++ b/packages/compiler-cli/ngcc/src/host/commonjs_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../../src/ngtsc/file_system'; import {Logger} from '../../../src/ngtsc/logging'; diff --git a/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts b/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts index 2f20337b5e4..b2920431084 100644 --- a/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts +++ b/packages/compiler-cli/ngcc/src/host/commonjs_umd_utils.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Declaration} from '../../../src/ngtsc/reflection'; import {isAssignment} from '../../../src/ngtsc/util/src/typescript'; diff --git a/packages/compiler-cli/ngcc/src/host/delegating_host.ts b/packages/compiler-cli/ngcc/src/host/delegating_host.ts index 63361469ec4..451d6fa55d8 100644 --- a/packages/compiler-cli/ngcc/src/host/delegating_host.ts +++ b/packages/compiler-cli/ngcc/src/host/delegating_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration, ClassMember, CtorParameter, Declaration, DeclarationNode, Decorator, FunctionDefinition, Import, ReflectionHost} from '../../../src/ngtsc/reflection'; import {isFromDtsFile} from '../../../src/ngtsc/util/src/typescript'; diff --git a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts index f75d577d902..c42e656887f 100644 --- a/packages/compiler-cli/ngcc/src/host/esm2015_host.ts +++ b/packages/compiler-cli/ngcc/src/host/esm2015_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile} from '../../../src/ngtsc/file_system'; import {Logger} from '../../../src/ngtsc/logging'; diff --git a/packages/compiler-cli/ngcc/src/host/esm5_host.ts b/packages/compiler-cli/ngcc/src/host/esm5_host.ts index 6561f9dd1ea..72d4ed07952 100644 --- a/packages/compiler-cli/ngcc/src/host/esm5_host.ts +++ b/packages/compiler-cli/ngcc/src/host/esm5_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration, ClassMember, ClassMemberKind, Declaration, DeclarationKind, Decorator, FunctionDefinition, isNamedFunctionDeclaration, KnownDeclaration, Parameter, reflectObjectLiteral} from '../../../src/ngtsc/reflection'; import {getTsHelperFnFromDeclaration, getTsHelperFnFromIdentifier, hasNameIdentifier} from '../utils'; diff --git a/packages/compiler-cli/ngcc/src/host/ngcc_host.ts b/packages/compiler-cli/ngcc/src/host/ngcc_host.ts index f4839c5d0cd..829c2f65293 100644 --- a/packages/compiler-cli/ngcc/src/host/ngcc_host.ts +++ b/packages/compiler-cli/ngcc/src/host/ngcc_host.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration, Declaration, Decorator, ReflectionHost} from '../../../src/ngtsc/reflection'; import {SymbolWithValueDeclaration} from '../../../src/ngtsc/util/src/typescript'; diff --git a/packages/compiler-cli/ngcc/src/host/umd_host.ts b/packages/compiler-cli/ngcc/src/host/umd_host.ts index f167213ff82..5ba952e7cff 100644 --- a/packages/compiler-cli/ngcc/src/host/umd_host.ts +++ b/packages/compiler-cli/ngcc/src/host/umd_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../../src/ngtsc/file_system'; import {Logger} from '../../../src/ngtsc/logging'; diff --git a/packages/compiler-cli/ngcc/src/host/utils.ts b/packages/compiler-cli/ngcc/src/host/utils.ts index b1b3bc37381..5a8cf1e183a 100644 --- a/packages/compiler-cli/ngcc/src/host/utils.ts +++ b/packages/compiler-cli/ngcc/src/host/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export function stripParentheses(node: ts.Node): ts.Node { return ts.isParenthesizedExpression(node) ? node.expression : node; diff --git a/packages/compiler-cli/ngcc/src/migrations/migration.ts b/packages/compiler-cli/ngcc/src/migrations/migration.ts index 7cd712a9c04..9da6386fc39 100644 --- a/packages/compiler-cli/ngcc/src/migrations/migration.ts +++ b/packages/compiler-cli/ngcc/src/migrations/migration.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataReader} from '../../../src/ngtsc/metadata'; import {PartialEvaluator} from '../../../src/ngtsc/partial_evaluator'; diff --git a/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts b/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts index 2ee3a33252f..b5d3c4e7ceb 100644 --- a/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts +++ b/packages/compiler-cli/ngcc/src/migrations/missing_injectable_migration.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {forwardRefResolver} from '../../../src/ngtsc/annotations'; import {Reference} from '../../../src/ngtsc/imports'; diff --git a/packages/compiler-cli/ngcc/src/migrations/undecorated_child_migration.ts b/packages/compiler-cli/ngcc/src/migrations/undecorated_child_migration.ts index 50a3116b695..0bd28e0a977 100644 --- a/packages/compiler-cli/ngcc/src/migrations/undecorated_child_migration.ts +++ b/packages/compiler-cli/ngcc/src/migrations/undecorated_child_migration.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {readBaseClass} from '../../../src/ngtsc/annotations/src/util'; import {Reference} from '../../../src/ngtsc/imports'; diff --git a/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts b/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts index d1e9edfb969..90d0bf95a05 100644 --- a/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts +++ b/packages/compiler-cli/ngcc/src/migrations/undecorated_parent_migration.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../../src/ngtsc/imports'; import {ClassDeclaration} from '../../../src/ngtsc/reflection'; diff --git a/packages/compiler-cli/ngcc/src/migrations/utils.ts b/packages/compiler-cli/ngcc/src/migrations/utils.ts index 16a6ccddf73..ac4b01def82 100644 --- a/packages/compiler-cli/ngcc/src/migrations/utils.ts +++ b/packages/compiler-cli/ngcc/src/migrations/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../../src/ngtsc/imports'; import {ClassDeclaration, Decorator, isNamedClassDeclaration, isNamedFunctionDeclaration, isNamedVariableDeclaration} from '../../../src/ngtsc/reflection'; import {MigrationHost} from './migration'; diff --git a/packages/compiler-cli/ngcc/src/packages/bundle_program.ts b/packages/compiler-cli/ngcc/src/packages/bundle_program.ts index acf3b42ee13..e8dd30386ac 100644 --- a/packages/compiler-cli/ngcc/src/packages/bundle_program.ts +++ b/packages/compiler-cli/ngcc/src/packages/bundle_program.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/ngcc/src/packages/configuration.ts b/packages/compiler-cli/ngcc/src/packages/configuration.ts index 26d15688d1e..c226efc0f57 100644 --- a/packages/compiler-cli/ngcc/src/packages/configuration.ts +++ b/packages/compiler-cli/ngcc/src/packages/configuration.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {createHash} from 'crypto'; -import {satisfies} from 'semver'; +import semver from 'semver'; import * as vm from 'vm'; import {AbsoluteFsPath, PathManipulation, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; @@ -181,7 +181,8 @@ export class PartiallyProcessedConfig { return configs[0]; } return configs.find( - config => satisfies(version, config.versionRange, {includePrerelease: true})) ?? + config => + semver.satisfies(version, config.versionRange, {includePrerelease: true})) ?? null; } diff --git a/packages/compiler-cli/ngcc/src/packages/entry_point.ts b/packages/compiler-cli/ngcc/src/packages/entry_point.ts index 74ee579f44f..ead358cc05e 100644 --- a/packages/compiler-cli/ngcc/src/packages/entry_point.ts +++ b/packages/compiler-cli/ngcc/src/packages/entry_point.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, PathManipulation, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {Logger} from '../../../src/ngtsc/logging'; diff --git a/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts b/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts index 25fffcf41cd..17e4f452108 100644 --- a/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts +++ b/packages/compiler-cli/ngcc/src/packages/entry_point_bundle.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, FileSystem, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {DtsProcessing} from '../execution/tasks/api'; import {PathMappings} from '../path_mappings'; diff --git a/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts b/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts index 70ed061b557..272e18afe29 100644 --- a/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts +++ b/packages/compiler-cli/ngcc/src/packages/ngcc_compiler_host.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, FileSystem, NgtscCompilerHost} from '../../../src/ngtsc/file_system'; import {isWithinPackage} from '../analysis/util'; diff --git a/packages/compiler-cli/ngcc/src/packages/patch_ts_expando_initializer.ts b/packages/compiler-cli/ngcc/src/packages/patch_ts_expando_initializer.ts index 6094c3c7dee..c3aa1d972a0 100644 --- a/packages/compiler-cli/ngcc/src/packages/patch_ts_expando_initializer.ts +++ b/packages/compiler-cli/ngcc/src/packages/patch_ts_expando_initializer.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {hasNameIdentifier} from '../utils'; /** diff --git a/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts b/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts index 2305e3dde06..5152bc003d3 100644 --- a/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts +++ b/packages/compiler-cli/ngcc/src/packages/source_file_cache.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; /** diff --git a/packages/compiler-cli/ngcc/src/packages/transformer.ts b/packages/compiler-cli/ngcc/src/packages/transformer.ts index 78aa506c02d..7ca9c7e0224 100644 --- a/packages/compiler-cli/ngcc/src/packages/transformer.ts +++ b/packages/compiler-cli/ngcc/src/packages/transformer.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ParsedConfiguration} from '../../..'; import {ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts index 98abc8d10f2..f8cbdcabde6 100644 --- a/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts +++ b/packages/compiler-cli/ngcc/src/rendering/commonjs_rendering_formatter.ts @@ -7,7 +7,7 @@ */ import {PathManipulation} from '@angular/compiler-cli/src/ngtsc/file_system'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reexport} from '../../../src/ngtsc/imports'; import {Import, ImportManager} from '../../../src/ngtsc/translator'; diff --git a/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts b/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts index 337cb673d9a..3ad38efe2ab 100644 --- a/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts +++ b/packages/compiler-cli/ngcc/src/rendering/dts_renderer.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {Reexport} from '../../../src/ngtsc/imports'; diff --git a/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts index 389eae65598..58e24fe8952 100644 --- a/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts +++ b/packages/compiler-cli/ngcc/src/rendering/esm5_rendering_formatter.ts @@ -7,7 +7,7 @@ */ import {Statement} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager, translateStatement} from '../../../src/ngtsc/translator'; import {CompiledClass} from '../analysis/types'; diff --git a/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts index 7edf77e072d..6e16227d9a4 100644 --- a/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts +++ b/packages/compiler-cli/ngcc/src/rendering/esm_rendering_formatter.ts @@ -7,7 +7,7 @@ */ import {Statement} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath, PathManipulation, toRelativeImport} from '../../../src/ngtsc/file_system'; import {Reexport} from '../../../src/ngtsc/imports'; diff --git a/packages/compiler-cli/ngcc/src/rendering/renderer.ts b/packages/compiler-cli/ngcc/src/rendering/renderer.ts index 8cbe2edea21..8f95fd012e0 100644 --- a/packages/compiler-cli/ngcc/src/rendering/renderer.ts +++ b/packages/compiler-cli/ngcc/src/rendering/renderer.ts @@ -7,7 +7,7 @@ */ import {ConstantPool, Expression, jsDocComment, LeadingComment, Statement, WrappedNodeExpr, WritePropExpr} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {Logger} from '../../../src/ngtsc/logging'; diff --git a/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts index 6c642de354e..5483f16dd04 100644 --- a/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts +++ b/packages/compiler-cli/ngcc/src/rendering/rendering_formatter.ts @@ -7,7 +7,7 @@ */ import {Statement} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reexport} from '../../../src/ngtsc/imports'; import {Import, ImportManager} from '../../../src/ngtsc/translator'; diff --git a/packages/compiler-cli/ngcc/src/rendering/source_maps.ts b/packages/compiler-cli/ngcc/src/rendering/source_maps.ts index 5091ac5ae39..59098e45ddf 100644 --- a/packages/compiler-cli/ngcc/src/rendering/source_maps.ts +++ b/packages/compiler-cli/ngcc/src/rendering/source_maps.ts @@ -5,9 +5,9 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {fromObject, generateMapFileComment, SourceMapConverter} from 'convert-source-map'; +import mapHelpers from 'convert-source-map'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, absoluteFromSourceFile, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {Logger} from '../../../src/ngtsc/logging'; @@ -17,7 +17,7 @@ import {FileToWrite} from './utils'; export interface SourceMapInfo { source: string; - map: SourceMapConverter|null; + map: mapHelpers.SourceMapConverter|null; isInline: boolean; } @@ -40,7 +40,7 @@ export function renderSourceAndMap( sourceFilePath, generatedContent, {map: generatedMap, mapPath: sourceMapPath}); const rawMergedMap: RawSourceMap = generatedFile.renderFlattenedSourceMap(); - const mergedMap = fromObject(rawMergedMap); + const mergedMap = mapHelpers.fromObject(rawMergedMap); const originalFile = loader.loadSourceFile(sourceFilePath, generatedMagicString.original); if (originalFile.rawMap === null && !sourceFile.isDeclarationFile || originalFile.rawMap?.origin === ContentOrigin.Inline) { @@ -56,7 +56,8 @@ export function renderSourceAndMap( ]; } - const sourceMapComment = generateMapFileComment(`${fs.basename(sourceFilePath)}.map`); + const sourceMapComment = + mapHelpers.generateMapFileComment(`${fs.basename(sourceFilePath)}.map`); return [ {path: sourceFilePath, contents: `${generatedFile.contents}\n${sourceMapComment}`}, {path: sourceMapPath, contents: mergedMap.toJSON()} @@ -66,7 +67,7 @@ export function renderSourceAndMap( sourceFilePath}": ${e.toString()}`); return [ {path: sourceFilePath, contents: generatedContent}, - {path: sourceMapPath, contents: fromObject(generatedMap).toJSON()}, + {path: sourceMapPath, contents: mapHelpers.fromObject(generatedMap).toJSON()}, ]; } } diff --git a/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts b/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts index b1591c37fe8..533fd0292fb 100644 --- a/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts +++ b/packages/compiler-cli/ngcc/src/rendering/umd_rendering_formatter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {PathManipulation} from '../../../src/ngtsc/file_system'; import {Reexport} from '../../../src/ngtsc/imports'; diff --git a/packages/compiler-cli/ngcc/src/rendering/utils.ts b/packages/compiler-cli/ngcc/src/rendering/utils.ts index cd647b9704d..a6eed19f155 100644 --- a/packages/compiler-cli/ngcc/src/rendering/utils.ts +++ b/packages/compiler-cli/ngcc/src/rendering/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {ImportRewriter, NoopImportRewriter, R3SymbolsImportRewriter} from '../../../src/ngtsc/imports'; import {NgccFlatImportRewriter} from './ngcc_import_rewriter'; diff --git a/packages/compiler-cli/ngcc/src/utils.ts b/packages/compiler-cli/ngcc/src/utils.ts index 7ca4d1923b5..c5dd66af6f1 100644 --- a/packages/compiler-cli/ngcc/src/utils.ts +++ b/packages/compiler-cli/ngcc/src/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, isRooted, ReadonlyFileSystem} from '../../src/ngtsc/file_system'; import {DeclarationNode, KnownDeclaration} from '../../src/ngtsc/reflection'; diff --git a/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts b/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts index f390fa19abe..0d2a77305f8 100644 --- a/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts +++ b/packages/compiler-cli/ngcc/test/analysis/decoration_analyzer_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {FatalDiagnosticError, makeDiagnostic} from '../../../src/ngtsc/diagnostics'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts b/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts index 2e9cd992c25..7613fff000a 100644 --- a/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/analysis/migration_host_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {makeDiagnostic} from '../../../src/ngtsc/diagnostics'; import {absoluteFrom} from '../../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts b/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts index f0012a5757e..65da400f585 100644 --- a/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts +++ b/packages/compiler-cli/ngcc/test/analysis/module_with_providers_analyzer_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/analysis/private_declarations_analyzer_spec.ts b/packages/compiler-cli/ngcc/test/analysis/private_declarations_analyzer_spec.ts index e07b05ea196..999628db2c6 100644 --- a/packages/compiler-cli/ngcc/test/analysis/private_declarations_analyzer_spec.ts +++ b/packages/compiler-cli/ngcc/test/analysis/private_declarations_analyzer_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts b/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts index d4f43ec98b2..4bdcf5e9a18 100644 --- a/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts +++ b/packages/compiler-cli/ngcc/test/analysis/references_registry_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts index d3a84cea3f3..8094dda73ff 100644 --- a/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/dependencies/commonjs_dependency_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, relativeFrom} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing'; import {loadTestFiles} from '../../../src/ngtsc/testing'; diff --git a/packages/compiler-cli/ngcc/test/dependencies/dts_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/dts_dependency_host_spec.ts index 3a18f368ad9..5304946d30d 100644 --- a/packages/compiler-cli/ngcc/test/dependencies/dts_dependency_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/dependencies/dts_dependency_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, relativeFrom} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts index a0a5ed55869..f9564f37e41 100644 --- a/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/dependencies/esm_dependency_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, relativeFrom} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts index 85f22859fef..ec1ad7d4803 100644 --- a/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/dependencies/umd_dependency_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, relativeFrom} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/execution/cluster/executor_spec.ts b/packages/compiler-cli/ngcc/test/execution/cluster/executor_spec.ts index ce79c66dcd1..0741c4e6bb5 100644 --- a/packages/compiler-cli/ngcc/test/execution/cluster/executor_spec.ts +++ b/packages/compiler-cli/ngcc/test/execution/cluster/executor_spec.ts @@ -9,7 +9,7 @@ /// import {getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {MockFileSystemNative, runInEachFileSystem} from '../../../../src/ngtsc/file_system/testing'; import {MockLogger} from '../../../../src/ngtsc/logging/testing'; diff --git a/packages/compiler-cli/ngcc/test/execution/cluster/package_json_updater_spec.ts b/packages/compiler-cli/ngcc/test/execution/cluster/package_json_updater_spec.ts index 36d6ae473f5..f3d1b1dc1b6 100644 --- a/packages/compiler-cli/ngcc/test/execution/cluster/package_json_updater_spec.ts +++ b/packages/compiler-cli/ngcc/test/execution/cluster/package_json_updater_spec.ts @@ -8,7 +8,7 @@ /// -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {absoluteFrom as _} from '../../../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/execution/cluster/worker_spec.ts b/packages/compiler-cli/ngcc/test/execution/cluster/worker_spec.ts index 359beb7ab54..fac4bd4385a 100644 --- a/packages/compiler-cli/ngcc/test/execution/cluster/worker_spec.ts +++ b/packages/compiler-cli/ngcc/test/execution/cluster/worker_spec.ts @@ -8,7 +8,7 @@ /// -import * as cluster from 'cluster'; +import cluster from 'cluster'; import {EventEmitter} from 'events'; import {AbsoluteFsPath} from '../../../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/ngcc/test/helpers/utils.ts b/packages/compiler-cli/ngcc/test/helpers/utils.ts index 6ddd8a0ef94..d8e941a0b0d 100644 --- a/packages/compiler-cli/ngcc/test/helpers/utils.ts +++ b/packages/compiler-cli/ngcc/test/helpers/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getFileSystem, NgtscCompilerHost} from '../../../src/ngtsc/file_system'; import {TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts b/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts index 3143a8b15d5..1b192d1978a 100644 --- a/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/host/commonjs_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts index 411ee039fb3..31d8c5d96e5 100644 --- a/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts +++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_import_helper_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts index 6cbe7ec2c64..497f471c182 100644 --- a/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/host/esm2015_host_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts index 2950c9c0d72..74275caa992 100644 --- a/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts +++ b/packages/compiler-cli/ngcc/test/host/esm5_host_import_helper_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts index b6521969bf6..8a3bb6737f3 100644 --- a/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/host/esm5_host_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts b/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts index b7114b3bc06..3ebae7955d1 100644 --- a/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts +++ b/packages/compiler-cli/ngcc/test/host/umd_host_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/host/util.ts b/packages/compiler-cli/ngcc/test/host/util.ts index 4fc662a5522..f8b56b2be12 100644 --- a/packages/compiler-cli/ngcc/test/host/util.ts +++ b/packages/compiler-cli/ngcc/test/host/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {Trait, TraitState} from '@angular/compiler-cli/src/ngtsc/transform'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {SemanticSymbol} from '../../../src/ngtsc/incremental/semantic_graph'; import {CtorParameter, TypeValueReferenceKind} from '../../../src/ngtsc/reflection'; diff --git a/packages/compiler-cli/ngcc/test/integration/util.ts b/packages/compiler-cli/ngcc/test/integration/util.ts index 8e708ad6d08..ed901dce0d3 100644 --- a/packages/compiler-cli/ngcc/test/integration/util.ts +++ b/packages/compiler-cli/ngcc/test/integration/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, FileSystem, getFileSystem} from '../../../src/ngtsc/file_system'; import {Folder, MockFileSystemPosix} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/migrations/missing_injectable_migration_spec.ts b/packages/compiler-cli/ngcc/test/migrations/missing_injectable_migration_spec.ts index 92de9ca154f..9e5fd669583 100644 --- a/packages/compiler-cli/ngcc/test/migrations/missing_injectable_migration_spec.ts +++ b/packages/compiler-cli/ngcc/test/migrations/missing_injectable_migration_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getFileSystem} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/migrations/undecorated_parent_migration_spec.ts b/packages/compiler-cli/ngcc/test/migrations/undecorated_parent_migration_spec.ts index 268be9369a3..fae47bfa89f 100644 --- a/packages/compiler-cli/ngcc/test/migrations/undecorated_parent_migration_spec.ts +++ b/packages/compiler-cli/ngcc/test/migrations/undecorated_parent_migration_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getFileSystem} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts b/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts index 6459f046dc9..c246af6db92 100644 --- a/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts +++ b/packages/compiler-cli/ngcc/test/packages/source_file_cache_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, FileSystem, getFileSystem} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts b/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts index 6d3cf14b681..8975fec4d16 100644 --- a/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/commonjs_rendering_formatter_spec.ts @@ -7,7 +7,7 @@ */ import {DeclareVarStmt, LiteralExpr, StmtModifier} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, absoluteFromSourceFile, AbsoluteFsPath, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts index 44e4160faaf..29eec5f4ed2 100644 --- a/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/dts_renderer_spec.ts @@ -5,10 +5,10 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {fromObject} from 'convert-source-map'; +import mapHelpers from 'convert-source-map'; import MagicString from 'magic-string'; import {encode} from 'sourcemap-codec'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; @@ -217,7 +217,7 @@ runInEachFileSystem(() => { it('should render an internal source map for files whose original file has an internal source map', () => { - const sourceMap = fromObject({ + const sourceMap = mapHelpers.fromObject({ 'version': 3, 'file': 'file.d.ts', 'sources': ['file.d.ts'], diff --git a/packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts index 8da3f9323bb..ca1bd61da8e 100644 --- a/packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/esm5_rendering_formatter_spec.ts @@ -7,7 +7,7 @@ */ import {DeclareVarStmt, LiteralExpr, StmtModifier} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, absoluteFromSourceFile, AbsoluteFsPath, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts b/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts index 0f7749108ea..138bf60c80c 100644 --- a/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/esm_rendering_formatter_spec.ts @@ -7,7 +7,7 @@ */ import {DeclareVarStmt, LiteralExpr, StmtModifier} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts index b369880b554..4771af1bfc4 100644 --- a/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/renderer_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ import {Statement} from '@angular/compiler'; -import {fromObject, fromSource, generateMapFileComment, SourceMapConverter} from 'convert-source-map'; +import mapHelpers from 'convert-source-map'; import MagicString from 'magic-string'; import {encode, SourceMapMappings} from 'sourcemap-codec'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; @@ -127,10 +127,10 @@ runInEachFileSystem(() => { let JS_CONTENT: TestFile; let COMPONENT_PROGRAM: TestFile; let NGMODULE_PROGRAM: TestFile; - let JS_CONTENT_MAP: SourceMapConverter; + let JS_CONTENT_MAP: mapHelpers.SourceMapConverter; let RENDERED_CONTENTS: string; - let OUTPUT_PROGRAM_MAP: SourceMapConverter; - let MERGED_OUTPUT_PROGRAM_MAP: SourceMapConverter; + let OUTPUT_PROGRAM_MAP: mapHelpers.SourceMapConverter; + let MERGED_OUTPUT_PROGRAM_MAP: mapHelpers.SourceMapConverter; beforeEach(() => { _ = absoluteFrom; @@ -182,7 +182,7 @@ runInEachFileSystem(() => { ], ]; - JS_CONTENT_MAP = fromObject({ + JS_CONTENT_MAP = mapHelpers.fromObject({ 'version': 3, 'file': 'file.js', 'sourceRoot': '', @@ -196,7 +196,7 @@ runInEachFileSystem(() => { `\n// ADD IMPORTS\n\n// ADD EXPORTS\r\n\n// ADD CONSTANTS\n\n// ADD ADJACENT STATEMENTS\n\n// ADD DEFINITIONS\n\n// REMOVE DECORATORS\n` + JS_CONTENT.contents; - OUTPUT_PROGRAM_MAP = fromObject({ + OUTPUT_PROGRAM_MAP = mapHelpers.fromObject({ 'version': 3, 'file': 'file.js', 'sources': ['file.js'], @@ -227,7 +227,7 @@ runInEachFileSystem(() => { 'sourcesContent': [JS_CONTENT.contents], }); - MERGED_OUTPUT_PROGRAM_MAP = fromObject({ + MERGED_OUTPUT_PROGRAM_MAP = mapHelpers.fromObject({ 'version': 3, 'file': 'file.js', 'sources': ['file.ts'], @@ -292,7 +292,7 @@ runInEachFileSystem(() => { decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses); expect(sourceFile.path).toEqual(_('/node_modules/test-package/src/file.js')); expect(sourceFile.contents).toContain(RENDERED_CONTENTS); - expect(fromSource(sourceFile.contents)!.toObject()) + expect(mapHelpers.fromSource(sourceFile.contents)!.toObject()) .toEqual(OUTPUT_PROGRAM_MAP.toObject()); expect(mapFile).toBeUndefined(); }); @@ -683,7 +683,7 @@ UndecoratedBase.ɵdir = /*@__PURE__*/ ɵngcc0.ɵɵdefineDirective({ type: Undeco decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses); expect(sourceFile.path).toEqual(_('/node_modules/test-package/src/file.js')); expect(sourceFile.contents).toContain(RENDERED_CONTENTS); - expect(fromSource(sourceFile.contents)!.toObject()) + expect(mapHelpers.fromSource(sourceFile.contents)!.toObject()) .toEqual(MERGED_OUTPUT_PROGRAM_MAP.toObject()); expect(mapFile).toBeUndefined(); }); @@ -706,7 +706,8 @@ UndecoratedBase.ɵdir = /*@__PURE__*/ ɵngcc0.ɵɵdefineDirective({ type: Undeco decorationAnalyses, switchMarkerAnalyses, privateDeclarationsAnalyses); expect(sourceFile.path).toEqual(_('/node_modules/test-package/src/file.js')); expect(sourceFile.contents) - .toEqual(RENDERED_CONTENTS + '\n' + generateMapFileComment('file.js.map')); + .toEqual( + RENDERED_CONTENTS + '\n' + mapHelpers.generateMapFileComment('file.js.map')); expect(mapFile.path).toEqual(_('/node_modules/test-package/src/file.js.map')); expect(JSON.parse(mapFile.contents) as any) .toEqual(MERGED_OUTPUT_PROGRAM_MAP.toObject()); diff --git a/packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts b/packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts index 9872271c372..b663b0b31e0 100644 --- a/packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts +++ b/packages/compiler-cli/ngcc/test/rendering/umd_rendering_formatter_spec.ts @@ -7,7 +7,7 @@ */ import {DeclareVarStmt, LiteralExpr, StmtModifier} from '@angular/compiler'; import MagicString from 'magic-string'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, absoluteFromSourceFile, getFileSystem, getSourceFileOrError} from '../../../src/ngtsc/file_system'; import {runInEachFileSystem, TestFile} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/ngcc/test/utils_spec.ts b/packages/compiler-cli/ngcc/test/utils_spec.ts index 6d288c7497e..98f2e61a4d2 100644 --- a/packages/compiler-cli/ngcc/test/utils_spec.ts +++ b/packages/compiler-cli/ngcc/test/utils_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom as _abs} from '../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../src/ngtsc/file_system/testing'; import {KnownDeclaration} from '../../src/ngtsc/reflection'; diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json index c89b4bc3cb2..03d9e54a364 100644 --- a/packages/compiler-cli/package.json +++ b/packages/compiler-cli/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/core": "^7.8.6", - "@babel/types": "^7.8.6", "reflect-metadata": "^0.1.2", "minimist": "^1.2.0", "canonical-path": "1.0.0", diff --git a/packages/compiler-cli/src/diagnostics/translate_diagnostics.ts b/packages/compiler-cli/src/diagnostics/translate_diagnostics.ts index df1d63ee058..2aad0852211 100644 --- a/packages/compiler-cli/src/diagnostics/translate_diagnostics.ts +++ b/packages/compiler-cli/src/diagnostics/translate_diagnostics.ts @@ -7,7 +7,7 @@ */ import {ParseSourceSpan} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {DEFAULT_ERROR_CODE, Diagnostic, SOURCE} from '../transformers/api'; import {GENERATED_FILES} from '../transformers/util'; diff --git a/packages/compiler-cli/src/main.ts b/packages/compiler-cli/src/main.ts index 872407caeb4..c00cb1281ee 100644 --- a/packages/compiler-cli/src/main.ts +++ b/packages/compiler-cli/src/main.ts @@ -7,7 +7,7 @@ */ import * as tsickle from 'tsickle'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Diagnostics, exitCodeFromResult, filterErrorsAndWarnings, formatDiagnostics, ParsedConfiguration, performCompilation, readConfiguration} from './perform_compile'; import {createPerformWatchHost, performWatchCompilation} from './perform_watch'; diff --git a/packages/compiler-cli/src/metadata/bundle_index_host.ts b/packages/compiler-cli/src/metadata/bundle_index_host.ts index 17080bcb7a7..86d4071ca76 100644 --- a/packages/compiler-cli/src/metadata/bundle_index_host.ts +++ b/packages/compiler-cli/src/metadata/bundle_index_host.ts @@ -8,7 +8,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CompilerOptions} from '../transformers/api'; import {MetadataCache} from '../transformers/metadata_cache'; diff --git a/packages/compiler-cli/src/metadata/bundler.ts b/packages/compiler-cli/src/metadata/bundler.ts index 694598f9eea..68d4a1da6bd 100644 --- a/packages/compiler-cli/src/metadata/bundler.ts +++ b/packages/compiler-cli/src/metadata/bundler.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataCache} from '../transformers/metadata_cache'; diff --git a/packages/compiler-cli/src/metadata/collector.ts b/packages/compiler-cli/src/metadata/collector.ts index 81510e93a81..8bee925b50d 100644 --- a/packages/compiler-cli/src/metadata/collector.ts +++ b/packages/compiler-cli/src/metadata/collector.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {errorSymbol, Evaluator, recordMapEntry} from './evaluator'; import {ClassMetadata, ConstructorMetadata, FunctionMetadata, InterfaceMetadata, isClassMetadata, isConstructorMetadata, isFunctionMetadata, isMetadataError, isMetadataGlobalReferenceExpression, isMetadataImportDefaultReference, isMetadataImportedSymbolReferenceExpression, isMetadataSymbolicExpression, isMetadataSymbolicReferenceExpression, isMetadataSymbolicSelectExpression, isMethodMetadata, MemberMetadata, METADATA_VERSION, MetadataEntry, MetadataError, MetadataMap, MetadataSymbolicBinaryExpression, MetadataSymbolicCallExpression, MetadataSymbolicExpression, MetadataSymbolicIfExpression, MetadataSymbolicIndexExpression, MetadataSymbolicPrefixExpression, MetadataSymbolicReferenceExpression, MetadataSymbolicSelectExpression, MetadataSymbolicSpreadExpression, MetadataValue, MethodMetadata, ModuleExportMetadata, ModuleMetadata} from './schema'; diff --git a/packages/compiler-cli/src/metadata/evaluator.ts b/packages/compiler-cli/src/metadata/evaluator.ts index 0c312a6f596..635165d9da5 100644 --- a/packages/compiler-cli/src/metadata/evaluator.ts +++ b/packages/compiler-cli/src/metadata/evaluator.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {CollectorOptions} from './collector'; import {ClassMetadata, FunctionMetadata, InterfaceMetadata, isMetadataError, isMetadataGlobalReferenceExpression, isMetadataImportDefaultReference, isMetadataImportedSymbolReferenceExpression, isMetadataModuleReferenceExpression, isMetadataSymbolicReferenceExpression, isMetadataSymbolicSpreadExpression, MetadataEntry, MetadataError, MetadataImportedSymbolReferenceExpression, MetadataSourceLocationInfo, MetadataSymbolicCallExpression, MetadataValue} from './schema'; diff --git a/packages/compiler-cli/src/metadata/symbols.ts b/packages/compiler-cli/src/metadata/symbols.ts index 21400f45bb6..7d058900081 100644 --- a/packages/compiler-cli/src/metadata/symbols.ts +++ b/packages/compiler-cli/src/metadata/symbols.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataSymbolicReferenceExpression, MetadataValue} from './schema'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts index 07ea536cb71..da81726c2f0 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/component.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/component.ts @@ -8,7 +8,7 @@ import {compileClassMetadata, compileComponentFromMetadata, compileDeclareClassMetadata, compileDeclareComponentFromMetadata, ConstantPool, CssSelector, DeclarationListEmitMode, DeclareComponentTemplateInfo, DEFAULT_INTERPOLATION_CONFIG, DomElementSchemaRegistry, Expression, ExternalExpr, FactoryTarget, InterpolationConfig, LexerRange, makeBindingParser, ParsedTemplate, ParseSourceFile, parseTemplate, R3ClassMetadata, R3ComponentMetadata, R3TargetBinder, R3UsedDirectiveMetadata, SelectorMatcher, Statement, TmplAstNode, WrappedNodeExpr} from '@angular/compiler'; import {ViewEncapsulation} from '@angular/compiler/src/core'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Cycle, CycleAnalyzer, CycleHandlingStrategy} from '../../cycles'; import {ErrorCode, FatalDiagnosticError, makeDiagnostic, makeRelatedInformation} from '../../diagnostics'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/diagnostics.ts b/packages/compiler-cli/src/ngtsc/annotations/src/diagnostics.ts index 195254d627b..d66f130192f 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/diagnostics.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/diagnostics.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError, makeDiagnostic, makeRelatedInformation} from '../../diagnostics'; import {Reference} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts index ba3447bfc38..01e7f25816a 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/directive.ts @@ -8,7 +8,7 @@ import {compileClassMetadata, compileDeclareClassMetadata, compileDeclareDirectiveFromMetadata, compileDirectiveFromMetadata, ConstantPool, Expression, ExternalExpr, FactoryTarget, getSafePropertyAccessString, makeBindingParser, ParsedHostBindings, ParseError, parseHostBindings, R3ClassMetadata, R3DirectiveMetadata, R3FactoryMetadata, R3QueryMetadata, Statement, verifyHostBindings, WrappedNodeExpr} from '@angular/compiler'; import {emitDistinctChangesOnlyDefaultValue} from '@angular/compiler/src/core'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError} from '../../diagnostics'; import {Reference} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts index 63b88bfd805..70f9c046340 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/injectable.ts @@ -7,7 +7,7 @@ */ import {compileClassMetadata, CompileClassMetadataFn, compileDeclareClassMetadata, compileDeclareInjectableFromMetadata, compileInjectable, createR3ProviderExpression, Expression, FactoryTarget, LiteralExpr, R3ClassMetadata, R3CompiledExpression, R3DependencyMetadata, R3InjectableMetadata, R3ProviderExpression, Statement, WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError} from '../../diagnostics'; import {InjectableClassRegistry} from '../../metadata'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts b/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts index 537e5354383..b453b09e453 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/metadata.ts @@ -7,7 +7,7 @@ */ import {Expression, FunctionExpr, LiteralArrayExpr, LiteralExpr, literalMap, R3ClassMetadata, ReturnStatement, WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CtorParameter, DeclarationNode, Decorator, ReflectionHost, TypeValueReferenceKind} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts index 7a745a13b20..46a367b8cbe 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/ng_module.ts @@ -7,7 +7,7 @@ */ import {compileClassMetadata, compileDeclareClassMetadata, compileDeclareInjectorFromMetadata, compileDeclareNgModuleFromMetadata, compileInjector, compileNgModule, CUSTOM_ELEMENTS_SCHEMA, Expression, ExternalExpr, FactoryTarget, Identifiers as R3, InvokeFunctionExpr, LiteralArrayExpr, LiteralExpr, NO_ERRORS_SCHEMA, R3ClassMetadata, R3CompiledExpression, R3FactoryMetadata, R3Identifiers, R3InjectorMetadata, R3NgModuleMetadata, R3Reference, SchemaMetadata, Statement, STRING_TYPE, WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError, makeDiagnostic, makeRelatedInformation} from '../../diagnostics'; import {Reference, ReferenceEmitter} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts index aede86ed504..06c7802beda 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/pipe.ts @@ -7,7 +7,7 @@ */ import {compileClassMetadata, compileDeclareClassMetadata, compileDeclarePipeFromMetadata, compilePipeFromMetadata, FactoryTarget, R3ClassMetadata, R3PipeMetadata, Statement, WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError} from '../../diagnostics'; import {Reference} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts index 69d29dbd01e..ca08545215e 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/src/util.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/src/util.ts @@ -9,7 +9,7 @@ import {Expression, ExternalExpr, LiteralExpr, ParseLocation, ParseSourceFile, ParseSourceSpan, R3CompiledExpression, R3DependencyMetadata, R3Reference, ReadPropExpr, Statement, WrappedNodeExpr} from '@angular/compiler'; import {R3FactoryMetadata} from '@angular/compiler/src/compiler'; import {FactoryTarget} from '@angular/compiler/src/render3/partial/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError, makeDiagnostic, makeRelatedInformation} from '../../diagnostics'; import {ImportFlags, Reference, ReferenceEmitter} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts index 0422821be1c..5af0e2defab 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/test/component_spec.ts @@ -7,7 +7,7 @@ */ import {ConstantPool} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CycleAnalyzer, CycleHandlingStrategy, ImportGraph} from '../../cycles'; import {ErrorCode, FatalDiagnosticError} from '../../diagnostics'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts index 390c6ee9336..5f4d67f4281 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/test/diagnostics_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom as _, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem, TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts index e45fade9998..d5b995a453d 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/test/directive_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {CssSelector, DirectiveMeta as T2DirectiveMeta, parseTemplate, R3TargetBinder, SelectorMatcher, TmplAstElement} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts index 180ccab12d0..42e1efc42ae 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/test/metadata_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {compileClassMetadata} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem, TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/ng_module_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/ng_module_spec.ts index 258564afef9..d8ff52aaee6 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/ng_module_spec.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/test/ng_module_spec.ts @@ -7,7 +7,7 @@ */ import {WrappedNodeExpr} from '@angular/compiler'; import {R3Reference} from '@angular/compiler/src/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts b/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts index 4f9ac98bb34..ad7355acf8b 100644 --- a/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts +++ b/packages/compiler-cli/src/ngtsc/annotations/test/util_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {unwrapExpression} from '../src/util'; diff --git a/packages/compiler-cli/src/ngtsc/core/api/src/adapter.ts b/packages/compiler-cli/src/ngtsc/core/api/src/adapter.ts index b9ba08a2cc0..d68c8b99613 100644 --- a/packages/compiler-cli/src/ngtsc/core/api/src/adapter.ts +++ b/packages/compiler-cli/src/ngtsc/core/api/src/adapter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../../file_system'; import {FactoryTracker} from '../../../shims/api'; diff --git a/packages/compiler-cli/src/ngtsc/core/api/src/interfaces.ts b/packages/compiler-cli/src/ngtsc/core/api/src/interfaces.ts index 7ebae6a82ff..072f7a77bd6 100644 --- a/packages/compiler-cli/src/ngtsc/core/api/src/interfaces.ts +++ b/packages/compiler-cli/src/ngtsc/core/api/src/interfaces.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * A host backed by a build system which has a unified view of the module namespace. diff --git a/packages/compiler-cli/src/ngtsc/core/api/src/options.ts b/packages/compiler-cli/src/ngtsc/core/api/src/options.ts index 037de2de6ea..39f4d141ce2 100644 --- a/packages/compiler-cli/src/ngtsc/core/api/src/options.ts +++ b/packages/compiler-cli/src/ngtsc/core/api/src/options.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {BazelAndG3Options, I18nOptions, LegacyNgcOptions, MiscOptions, NgcCompatibilityOptions, StrictTemplateOptions, TargetOptions} from './public_options'; diff --git a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts index e4dd475898c..4477a0cf45c 100644 --- a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts +++ b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ComponentDecoratorHandler, DirectiveDecoratorHandler, InjectableDecoratorHandler, NgModuleDecoratorHandler, NoopReferencesRegistry, PipeDecoratorHandler, ReferencesRegistry} from '../../annotations'; import {CycleAnalyzer, CycleHandlingStrategy, ImportGraph} from '../../cycles'; diff --git a/packages/compiler-cli/src/ngtsc/core/src/host.ts b/packages/compiler-cli/src/ngtsc/core/src/host.ts index b6378b9d2da..7857a9da887 100644 --- a/packages/compiler-cli/src/ngtsc/core/src/host.ts +++ b/packages/compiler-cli/src/ngtsc/core/src/host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../diagnostics'; import {findFlatIndexEntryPoint, FlatIndexGenerator} from '../../entry_point'; diff --git a/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts b/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts index 141f90bc991..78e7c544b9e 100644 --- a/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts +++ b/packages/compiler-cli/src/ngtsc/core/test/compiler_test.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom as _, FileSystem, getFileSystem, getSourceFileOrError, NgtscCompilerHost, setFileSystem} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/cycles/src/analyzer.ts b/packages/compiler-cli/src/ngtsc/cycles/src/analyzer.ts index 237ba044151..03e0fd71465 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/src/analyzer.ts +++ b/packages/compiler-cli/src/ngtsc/cycles/src/analyzer.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportGraph} from './imports'; diff --git a/packages/compiler-cli/src/ngtsc/cycles/src/imports.ts b/packages/compiler-cli/src/ngtsc/cycles/src/imports.ts index f55806ef9ac..650e1b7c54c 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/src/imports.ts +++ b/packages/compiler-cli/src/ngtsc/cycles/src/imports.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {PerfPhase, PerfRecorder} from '../../perf'; diff --git a/packages/compiler-cli/src/ngtsc/cycles/test/analyzer_spec.ts b/packages/compiler-cli/src/ngtsc/cycles/test/analyzer_spec.ts index e333aabc054..30a6abf6acb 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/test/analyzer_spec.ts +++ b/packages/compiler-cli/src/ngtsc/cycles/test/analyzer_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; import {NOOP_PERF_RECORDER} from '../../perf'; diff --git a/packages/compiler-cli/src/ngtsc/cycles/test/imports_spec.ts b/packages/compiler-cli/src/ngtsc/cycles/test/imports_spec.ts index f721aa3a00d..0902e13dc8c 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/test/imports_spec.ts +++ b/packages/compiler-cli/src/ngtsc/cycles/test/imports_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; import {NOOP_PERF_RECORDER} from '../../perf'; diff --git a/packages/compiler-cli/src/ngtsc/cycles/test/util.ts b/packages/compiler-cli/src/ngtsc/cycles/test/util.ts index 67868b936e7..987407175a6 100644 --- a/packages/compiler-cli/src/ngtsc/cycles/test/util.ts +++ b/packages/compiler-cli/src/ngtsc/cycles/test/util.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getFileSystem, PathManipulation} from '../../file_system'; import {TestFile} from '../../file_system/testing'; import {makeProgram} from '../../testing'; diff --git a/packages/compiler-cli/src/ngtsc/diagnostics/src/error.ts b/packages/compiler-cli/src/ngtsc/diagnostics/src/error.ts index 0822840a9aa..9600ef573c4 100644 --- a/packages/compiler-cli/src/ngtsc/diagnostics/src/error.ts +++ b/packages/compiler-cli/src/ngtsc/diagnostics/src/error.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from './error_code'; diff --git a/packages/compiler-cli/src/ngtsc/entry_point/src/generator.ts b/packages/compiler-cli/src/ngtsc/entry_point/src/generator.ts index 5713dc1055c..bd3538d4a59 100644 --- a/packages/compiler-cli/src/ngtsc/entry_point/src/generator.ts +++ b/packages/compiler-cli/src/ngtsc/entry_point/src/generator.ts @@ -8,7 +8,7 @@ /// -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, dirname, join} from '../../file_system'; import {TopLevelShimGenerator} from '../../shims/api'; diff --git a/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts b/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts index 3dd66134d62..fbe94d8bba7 100644 --- a/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts +++ b/packages/compiler-cli/src/ngtsc/entry_point/src/private_export_checker.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../diagnostics'; import {DeclarationNode} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/compiler_host.ts b/packages/compiler-cli/src/ngtsc/file_system/src/compiler_host.ts index 6e5d0f0fe4b..322fa400306 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/src/compiler_host.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/src/compiler_host.ts @@ -8,7 +8,7 @@ /// import * as os from 'os'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from './helpers'; import {FileSystem} from './types'; diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/helpers.ts b/packages/compiler-cli/src/ngtsc/file_system/src/helpers.ts index 04639840c77..b584794af0c 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/src/helpers.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/src/helpers.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {InvalidFileSystem} from './invalid_file_system'; import {AbsoluteFsPath, FileSystem, PathSegment, PathString} from './types'; diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/logical.ts b/packages/compiler-cli/src/ngtsc/file_system/src/logical.ts index 02076286e3f..4cad739e894 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/src/logical.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/src/logical.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, dirname, isLocalRelativePath, relative, resolve, toRelativeImport} from './helpers'; import {AbsoluteFsPath, BrandedPath, PathSegment} from './types'; diff --git a/packages/compiler-cli/src/ngtsc/file_system/src/util.ts b/packages/compiler-cli/src/ngtsc/file_system/src/util.ts index 728bc93fbdb..90ae17cde46 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/src/util.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/src/util.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, PathString} from './types'; const TS_DTS_JS_EXTENSION = /(?:\.d)?\.ts$|\.js$/; diff --git a/packages/compiler-cli/src/ngtsc/file_system/test/compiler_host_spec.ts b/packages/compiler-cli/src/ngtsc/file_system/test/compiler_host_spec.ts index c05f2a7e335..9fe7ee1c6da 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/test/compiler_host_spec.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/test/compiler_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {NgtscCompilerHost} from '../src/compiler_host'; import {absoluteFrom, getFileSystem} from '../src/helpers'; import {runInEachFileSystem} from '../testing'; diff --git a/packages/compiler-cli/src/ngtsc/file_system/testing/src/test_helper.ts b/packages/compiler-cli/src/ngtsc/file_system/testing/src/test_helper.ts index 918474b7f80..273732cfa50 100644 --- a/packages/compiler-cli/src/ngtsc/file_system/testing/src/test_helper.ts +++ b/packages/compiler-cli/src/ngtsc/file_system/testing/src/test_helper.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ /// -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, setFileSystem} from '../../src/helpers'; import {InvalidFileSystem} from '../../src/invalid_file_system'; diff --git a/packages/compiler-cli/src/ngtsc/imports/src/alias.ts b/packages/compiler-cli/src/ngtsc/imports/src/alias.ts index 7af8ffebf05..98b7ef703c6 100644 --- a/packages/compiler-cli/src/ngtsc/imports/src/alias.ts +++ b/packages/compiler-cli/src/ngtsc/imports/src/alias.ts @@ -7,7 +7,7 @@ */ import {Expression, ExternalExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UnifiedModulesHost} from '../../core/api'; import {ClassDeclaration, ReflectionHost} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/imports/src/default.ts b/packages/compiler-cli/src/ngtsc/imports/src/default.ts index 05bf46627ee..b1585c96795 100644 --- a/packages/compiler-cli/src/ngtsc/imports/src/default.ts +++ b/packages/compiler-cli/src/ngtsc/imports/src/default.ts @@ -7,7 +7,7 @@ */ import {WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getSourceFile} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts index 80b2bf95b1b..b1b86b19e34 100644 --- a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts +++ b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {Expression, ExternalExpr, ExternalReference, WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UnifiedModulesHost} from '../../core/api'; import {absoluteFromSourceFile, dirname, LogicalFileSystem, LogicalProjectPath, relative, toRelativeImport} from '../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/imports/src/find_export.ts b/packages/compiler-cli/src/ngtsc/imports/src/find_export.ts index a3467d00cc3..65e0f88a8bf 100644 --- a/packages/compiler-cli/src/ngtsc/imports/src/find_export.ts +++ b/packages/compiler-cli/src/ngtsc/imports/src/find_export.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ReflectionHost} from '../../reflection'; import {isNamedDeclaration} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/imports/src/references.ts b/packages/compiler-cli/src/ngtsc/imports/src/references.ts index ba7e1063ac1..9f29a592f90 100644 --- a/packages/compiler-cli/src/ngtsc/imports/src/references.ts +++ b/packages/compiler-cli/src/ngtsc/imports/src/references.ts @@ -7,7 +7,7 @@ */ import {Expression} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {identifierOfNode} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/imports/src/resolver.ts b/packages/compiler-cli/src/ngtsc/imports/src/resolver.ts index 59f27df0ac0..893c4530b4a 100644 --- a/packages/compiler-cli/src/ngtsc/imports/src/resolver.ts +++ b/packages/compiler-cli/src/ngtsc/imports/src/resolver.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../file_system'; import {getSourceFileOrNull, resolveModuleName} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts b/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts index 307ecceda17..f9aea84bca2 100644 --- a/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts +++ b/packages/compiler-cli/src/ngtsc/imports/test/default_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; import {getDeclaration, makeProgram} from '../../testing'; diff --git a/packages/compiler-cli/src/ngtsc/imports/test/emitter_spec.ts b/packages/compiler-cli/src/ngtsc/imports/test/emitter_spec.ts index 3b5f968df5e..04e1737302c 100644 --- a/packages/compiler-cli/src/ngtsc/imports/test/emitter_spec.ts +++ b/packages/compiler-cli/src/ngtsc/imports/test/emitter_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {ExternalExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UnifiedModulesHost} from '../../core/api'; import {absoluteFrom as _, basename, LogicalFileSystem} from '../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/incremental/api.ts b/packages/compiler-cli/src/ngtsc/incremental/api.ts index 5a52c8627e3..a86eda3e410 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/api.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/api.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../file_system'; /** diff --git a/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/api.ts b/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/api.ts index 8214f15446b..8453d2a40f2 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/api.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/api.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../../file_system'; import {ClassDeclaration} from '../../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/type_parameters.ts b/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/type_parameters.ts index c77e9d2e683..25c1f0ea292 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/type_parameters.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/semantic_graph/src/type_parameters.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration} from '../../../reflection'; import {isArrayEqual} from './util'; diff --git a/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts b/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts index 63a557da16c..48b07cdb0a7 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/src/dependency_tracking.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../file_system'; import {DependencyTracker} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/incremental/src/incremental.ts b/packages/compiler-cli/src/ngtsc/incremental/src/incremental.ts index 7ef18d83c22..939ae312fe8 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/src/incremental.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/src/incremental.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath, resolve} from '../../file_system'; import {PerfPhase, PerfRecorder} from '../../perf'; diff --git a/packages/compiler-cli/src/ngtsc/incremental/src/state.ts b/packages/compiler-cli/src/ngtsc/incremental/src/state.ts index 5526affe5c0..08503ac6e9a 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/src/state.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/src/state.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {ClassRecord} from '../../transform'; diff --git a/packages/compiler-cli/src/ngtsc/incremental/src/strategy.ts b/packages/compiler-cli/src/ngtsc/incremental/src/strategy.ts index 94525a767ae..b52a99cf286 100644 --- a/packages/compiler-cli/src/ngtsc/incremental/src/strategy.ts +++ b/packages/compiler-cli/src/ngtsc/incremental/src/strategy.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {IncrementalState} from './state'; /** diff --git a/packages/compiler-cli/src/ngtsc/indexer/test/util.ts b/packages/compiler-cli/src/ngtsc/indexer/test/util.ts index 0ec5238cb3e..5f2f657b758 100644 --- a/packages/compiler-cli/src/ngtsc/indexer/test/util.ts +++ b/packages/compiler-cli/src/ngtsc/indexer/test/util.ts @@ -7,7 +7,7 @@ */ import {BoundTarget, CssSelector, parseTemplate, ParseTemplateOptions, R3TargetBinder, SelectorMatcher} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath} from '../../file_system'; import {Reference} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts index d686e2faab4..17bce3649f1 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/src/api.ts +++ b/packages/compiler-cli/src/ngtsc/metadata/src/api.ts @@ -7,7 +7,7 @@ */ import {DirectiveMeta as T2DirectiveMeta, SchemaMetadata} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {ClassDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts b/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts index 2ea11b0c8e5..da2518d57af 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts +++ b/packages/compiler-cli/src/ngtsc/metadata/src/dts.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {ClassDeclaration, isNamedClassDeclaration, ReflectionHost, TypeValueReferenceKind} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/resource_registry.ts b/packages/compiler-cli/src/ngtsc/metadata/src/resource_registry.ts index 28a50e1263b..2a229a7ac97 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/src/resource_registry.ts +++ b/packages/compiler-cli/src/ngtsc/metadata/src/resource_registry.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {ClassDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts index 597417440f6..fd525a613e4 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/src/util.ts +++ b/packages/compiler-cli/src/ngtsc/metadata/src/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {OwningModule, Reference} from '../../imports'; import {ClassDeclaration, ClassMember, ClassMemberKind, isNamedClassDeclaration, ReflectionHost, reflectTypeEntityToDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/dts_spec.ts b/packages/compiler-cli/src/ngtsc/metadata/test/dts_spec.ts index f3acf1e4798..1b1c8251931 100644 --- a/packages/compiler-cli/src/ngtsc/metadata/test/dts_spec.ts +++ b/packages/compiler-cli/src/ngtsc/metadata/test/dts_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {ExternalExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getFileSystem, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/builtin.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/builtin.ts index 92ad9d60a0c..379bb789cc5 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/builtin.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/builtin.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {DynamicValue} from './dynamic'; import {KnownFn, ResolvedValue, ResolvedValueArray} from './result'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/diagnostics.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/diagnostics.ts index 17af7e00f66..4a92ff3cb75 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/diagnostics.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/diagnostics.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {makeRelatedInformation} from '../../diagnostics'; import {Reference} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts index a9a6c940e2d..0880412c398 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/dynamic.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {FunctionDefinition} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interface.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interface.ts index ede38153085..f0de1519e3b 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interface.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interface.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {DependencyTracker} from '../../incremental/api'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts index 7102efbcddd..ae0558cf459 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/interpreter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {OwningModule} from '../../imports/src/references'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/result.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/result.ts index edbc5718e6c..f0ef79bd433 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/result.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/result.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {Declaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/ts_helpers.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/ts_helpers.ts index f6cc035257b..2d216f05389 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/src/ts_helpers.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/src/ts_helpers.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ObjectAssignBuiltinFn} from './builtin'; import {DynamicValue} from './dynamic'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/diagnostics_spec.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/diagnostics_spec.ts index a2600eb7212..71729ab821d 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/diagnostics_spec.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/diagnostics_spec.ts @@ -7,7 +7,7 @@ */ import {platform} from 'os'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom as _, absoluteFromSourceFile} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts index bf322d05cf5..9edd62fc23b 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/evaluator_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/utils.ts b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/utils.ts index 1bb6c46d831..595f020a961 100644 --- a/packages/compiler-cli/src/ngtsc/partial_evaluator/test/utils.ts +++ b/packages/compiler-cli/src/ngtsc/partial_evaluator/test/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../file_system'; import {TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/program.ts b/packages/compiler-cli/src/ngtsc/program.ts index a200d0fc68d..0fa22bd1441 100644 --- a/packages/compiler-cli/src/ngtsc/program.ts +++ b/packages/compiler-cli/src/ngtsc/program.ts @@ -7,7 +7,7 @@ */ import {GeneratedFile, HtmlParser, MessageBundle} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import * as api from '../transformers/api'; import {i18nExtract} from '../transformers/i18n'; diff --git a/packages/compiler-cli/src/ngtsc/program_driver/src/api.ts b/packages/compiler-cli/src/ngtsc/program_driver/src/api.ts index f837244d168..33d1a8dfcf4 100644 --- a/packages/compiler-cli/src/ngtsc/program_driver/src/api.ts +++ b/packages/compiler-cli/src/ngtsc/program_driver/src/api.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; export interface FileUpdate { diff --git a/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts b/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts index 5c4c483fb1f..fe77f6702dc 100644 --- a/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts +++ b/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {copyFileShimData, retagAllTsFiles, ShimReferenceTagger, untagAllTsFiles} from '../../shims'; diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/host.ts b/packages/compiler-cli/src/ngtsc/reflection/src/host.ts index 9eb7df10e31..080a10b360c 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/src/host.ts +++ b/packages/compiler-cli/src/ngtsc/reflection/src/host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Metadata extracted from an instance of a decorator on another declaration, or synthesized from diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts b/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts index bfacb8987e6..92d27cb710d 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts +++ b/packages/compiler-cli/src/ngtsc/reflection/src/type_to_value.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeValueReference, TypeValueReferenceKind, UnavailableTypeValueReference, ValueUnavailableKind} from './host'; diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts b/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts index 22cb754abd5..cc36a2b7136 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts +++ b/packages/compiler-cli/src/ngtsc/reflection/src/typescript.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration, ClassMember, ClassMemberKind, CtorParameter, Declaration, DeclarationKind, DeclarationNode, Decorator, FunctionDefinition, Import, isDecoratorIdentifier, ReflectionHost} from './host'; import {typeToValue} from './type_to_value'; diff --git a/packages/compiler-cli/src/ngtsc/reflection/src/util.ts b/packages/compiler-cli/src/ngtsc/reflection/src/util.ts index 8aaffc8b24f..c533e6c0a1a 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/src/util.ts +++ b/packages/compiler-cli/src/ngtsc/reflection/src/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration} from './host'; export function isNamedClassDeclaration(node: ts.Node): diff --git a/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts b/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts index fd5c7c7ffb1..aab9cd8ec1f 100644 --- a/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts +++ b/packages/compiler-cli/src/ngtsc/reflection/test/ts_host_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; import {getDeclaration, makeProgram} from '../../testing'; diff --git a/packages/compiler-cli/src/ngtsc/resource/src/loader.ts b/packages/compiler-cli/src/ngtsc/resource/src/loader.ts index ad18b05a6e4..d5600c0995f 100644 --- a/packages/compiler-cli/src/ngtsc/resource/src/loader.ts +++ b/packages/compiler-cli/src/ngtsc/resource/src/loader.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ResourceLoader, ResourceLoaderContext} from '../../annotations'; import {NgCompilerAdapter, ResourceHostContext} from '../../core/api'; diff --git a/packages/compiler-cli/src/ngtsc/scope/src/dependency.ts b/packages/compiler-cli/src/ngtsc/scope/src/dependency.ts index f682352dd02..f214115d366 100644 --- a/packages/compiler-cli/src/ngtsc/scope/src/dependency.ts +++ b/packages/compiler-cli/src/ngtsc/scope/src/dependency.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AliasingHost, Reference} from '../../imports'; import {DirectiveMeta, MetadataReader, PipeMeta} from '../../metadata'; diff --git a/packages/compiler-cli/src/ngtsc/scope/src/local.ts b/packages/compiler-cli/src/ngtsc/scope/src/local.ts index 5e509324d12..c1fd10c7784 100644 --- a/packages/compiler-cli/src/ngtsc/scope/src/local.ts +++ b/packages/compiler-cli/src/ngtsc/scope/src/local.ts @@ -7,7 +7,7 @@ */ import {ExternalExpr, SchemaMetadata} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, makeDiagnostic, makeRelatedInformation} from '../../diagnostics'; import {AliasingHost, Reexport, Reference, ReferenceEmitter} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/scope/src/typecheck.ts b/packages/compiler-cli/src/ngtsc/scope/src/typecheck.ts index a162a9a7284..922f0f75c22 100644 --- a/packages/compiler-cli/src/ngtsc/scope/src/typecheck.ts +++ b/packages/compiler-cli/src/ngtsc/scope/src/typecheck.ts @@ -7,7 +7,7 @@ */ import {CssSelector, SchemaMetadata, SelectorMatcher} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {DirectiveMeta, flattenInheritedDirectiveMetadata, MetadataReader} from '../../metadata'; diff --git a/packages/compiler-cli/src/ngtsc/scope/test/dependency_spec.ts b/packages/compiler-cli/src/ngtsc/scope/test/dependency_spec.ts index 8298910a4d2..95d8d75bb09 100644 --- a/packages/compiler-cli/src/ngtsc/scope/test/dependency_spec.ts +++ b/packages/compiler-cli/src/ngtsc/scope/test/dependency_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {ExternalExpr, ExternalReference} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UnifiedModulesHost} from '../../core/api'; import {absoluteFrom} from '../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts b/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts index 0aa1d0c49f0..b1f23c221e0 100644 --- a/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts +++ b/packages/compiler-cli/src/ngtsc/scope/test/local_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference, ReferenceEmitter} from '../../imports'; import {ClassPropertyMapping, CompoundMetadataRegistry, DirectiveMeta, LocalMetadataRegistry, MetadataRegistry, MetaType, PipeMeta} from '../../metadata'; diff --git a/packages/compiler-cli/src/ngtsc/shims/api.ts b/packages/compiler-cli/src/ngtsc/shims/api.ts index ec1e943c139..db52e2c0bcb 100644 --- a/packages/compiler-cli/src/ngtsc/shims/api.ts +++ b/packages/compiler-cli/src/ngtsc/shims/api.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../file_system'; /** diff --git a/packages/compiler-cli/src/ngtsc/shims/src/adapter.ts b/packages/compiler-cli/src/ngtsc/shims/src/adapter.ts index ab4494568d0..28603ae76b2 100644 --- a/packages/compiler-cli/src/ngtsc/shims/src/adapter.ts +++ b/packages/compiler-cli/src/ngtsc/shims/src/adapter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, absoluteFromSourceFile, AbsoluteFsPath} from '../../file_system'; import {isDtsPath} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/shims/src/expando.ts b/packages/compiler-cli/src/ngtsc/shims/src/expando.ts index 3d03ce42ba0..3868bda326b 100644 --- a/packages/compiler-cli/src/ngtsc/shims/src/expando.ts +++ b/packages/compiler-cli/src/ngtsc/shims/src/expando.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts b/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts index 6746a8e0d20..01018ae31c4 100644 --- a/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts +++ b/packages/compiler-cli/src/ngtsc/shims/src/factory_generator.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath, basename} from '../../file_system'; import {ImportRewriter} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/shims/src/reference_tagger.ts b/packages/compiler-cli/src/ngtsc/shims/src/reference_tagger.ts index 3e0a3fe428c..7fed2d506d1 100644 --- a/packages/compiler-cli/src/ngtsc/shims/src/reference_tagger.ts +++ b/packages/compiler-cli/src/ngtsc/shims/src/reference_tagger.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile} from '../../file_system'; import {isNonDeclarationTsPath} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/shims/src/summary_generator.ts b/packages/compiler-cli/src/ngtsc/shims/src/summary_generator.ts index 1b2634d398a..9c1a3d03a32 100644 --- a/packages/compiler-cli/src/ngtsc/shims/src/summary_generator.ts +++ b/packages/compiler-cli/src/ngtsc/shims/src/summary_generator.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {PerFileShimGenerator} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/shims/test/adapter_spec.ts b/packages/compiler-cli/src/ngtsc/shims/test/adapter_spec.ts index 39c491d6e20..312325107bd 100644 --- a/packages/compiler-cli/src/ngtsc/shims/test/adapter_spec.ts +++ b/packages/compiler-cli/src/ngtsc/shims/test/adapter_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom as _} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/shims/test/reference_tagger_spec.ts b/packages/compiler-cli/src/ngtsc/shims/test/reference_tagger_spec.ts index 807d0996f9b..0e70e94d66f 100644 --- a/packages/compiler-cli/src/ngtsc/shims/test/reference_tagger_spec.ts +++ b/packages/compiler-cli/src/ngtsc/shims/test/reference_tagger_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom as _, AbsoluteFsPath, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/shims/test/util.ts b/packages/compiler-cli/src/ngtsc/shims/test/util.ts index ad235639821..432675a5fc5 100644 --- a/packages/compiler-cli/src/ngtsc/shims/test/util.ts +++ b/packages/compiler-cli/src/ngtsc/shims/test/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../file_system'; import {PerFileShimGenerator} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts index 5405756f605..6db7f72ca76 100644 --- a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts +++ b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {removeComments, removeMapFileComments} from 'convert-source-map'; +import mapHelpers from 'convert-source-map'; import {decode, encode, SourceMapMappings, SourceMapSegment} from 'sourcemap-codec'; import {AbsoluteFsPath, PathManipulation} from '../../file_system'; @@ -14,7 +14,8 @@ import {RawSourceMap, SourceMapInfo} from './raw_source_map'; import {compareSegments, offsetSegment, SegmentMarker} from './segment_marker'; export function removeSourceMapComments(contents: string): string { - return removeMapFileComments(removeComments(contents)).replace(/\n\n$/, '\n'); + return mapHelpers.removeMapFileComments(mapHelpers.removeComments(contents)) + .replace(/\n\n$/, '\n'); } export class SourceFile { diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts index bb6721cc12c..b0d1016fe01 100644 --- a/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts +++ b/packages/compiler-cli/src/ngtsc/sourcemaps/src/source_file_loader.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {commentRegex, fromComment, mapFileCommentRegex} from 'convert-source-map'; +import mapHelpers from 'convert-source-map'; import {AbsoluteFsPath, ReadonlyFileSystem} from '../../file_system'; import {Logger} from '../../logging'; @@ -139,10 +139,10 @@ export class SourceFileLoader { // are embedded source-map comments elsewhere in the file (as can be the case with bundlers like // webpack). const lastLine = this.getLastNonEmptyLine(sourceContents); - const inline = commentRegex.exec(lastLine); + const inline = mapHelpers.commentRegex.exec(lastLine); if (inline !== null) { return { - map: fromComment(inline.pop()!).sourcemap, + map: mapHelpers.fromComment(inline.pop()!).sourcemap, mapPath: null, origin: ContentOrigin.Inline, }; @@ -155,7 +155,7 @@ export class SourceFileLoader { return null; } - const external = mapFileCommentRegex.exec(lastLine); + const external = mapHelpers.mapFileCommentRegex.exec(lastLine); if (external) { try { const fileName = external[1] || external[2]; diff --git a/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_loader_spec.ts b/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_loader_spec.ts index 1e86114cf48..5be7e31247c 100644 --- a/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_loader_spec.ts +++ b/packages/compiler-cli/src/ngtsc/sourcemaps/test/source_file_loader_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {fromObject} from 'convert-source-map'; +import mapHelpers from 'convert-source-map'; import {absoluteFrom, FileSystem, getFileSystem} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; @@ -255,19 +255,21 @@ runInEachFileSystem(() => { const aMap = createRawSourceMap({file: 'a.js', sources: ['b.js']}); const aPath = _('/foo/src/a.js'); - fs.writeFile(aPath, 'a content\n' + fromObject(aMap).toComment()); + fs.writeFile(aPath, 'a content\n' + mapHelpers.fromObject(aMap).toComment()); const bPath = _('/foo/src/b.js'); fs.writeFile( bPath, 'b content\n' + - fromObject(createRawSourceMap({file: 'b.js', sources: ['c.js']})).toComment()); + mapHelpers.fromObject(createRawSourceMap({file: 'b.js', sources: ['c.js']})) + .toComment()); const cPath = _('/foo/src/c.js'); fs.writeFile( cPath, 'c content\n' + - fromObject(createRawSourceMap({file: 'c.js', sources: ['a.js']})).toComment()); + mapHelpers.fromObject(createRawSourceMap({file: 'c.js', sources: ['a.js']})) + .toComment()); const sourceFile = registry.loadSourceFile(aPath)!; expect(sourceFile).not.toBe(null!); @@ -338,7 +340,7 @@ runInEachFileSystem(() => { const aPath = _('/foo/src/a.js'); const aMap = createRawSourceMap( {file: 'a.js', sources: ['a.js'], sourcesContent: ['inline original a.js content']}); - fs.writeFile(aPath, 'a content\n' + fromObject(aMap).toComment()); + fs.writeFile(aPath, 'a content\n' + mapHelpers.fromObject(aMap).toComment()); const sourceFile = registry.loadSourceFile(aPath); if (sourceFile === null) { diff --git a/packages/compiler-cli/src/ngtsc/switch/src/switch.ts b/packages/compiler-cli/src/ngtsc/switch/src/switch.ts index 8d40c1e3dbd..985bf676e80 100644 --- a/packages/compiler-cli/src/ngtsc/switch/src/switch.ts +++ b/packages/compiler-cli/src/ngtsc/switch/src/switch.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; const IVY_SWITCH_PRE_SUFFIX = '__PRE_R3__'; const IVY_SWITCH_POST_SUFFIX = '__POST_R3__'; diff --git a/packages/compiler-cli/src/ngtsc/testing/src/cached_source_files.ts b/packages/compiler-cli/src/ngtsc/testing/src/cached_source_files.ts index c3cde20c8cc..2eec3b59a91 100644 --- a/packages/compiler-cli/src/ngtsc/testing/src/cached_source_files.ts +++ b/packages/compiler-cli/src/ngtsc/testing/src/cached_source_files.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {basename} from '../../file_system'; // A cache of source files that are typically used across tests and are expensive to parse. diff --git a/packages/compiler-cli/src/ngtsc/testing/src/compiler_host.ts b/packages/compiler-cli/src/ngtsc/testing/src/compiler_host.ts index 1ccb9ed120c..8711b35396d 100644 --- a/packages/compiler-cli/src/ngtsc/testing/src/compiler_host.ts +++ b/packages/compiler-cli/src/ngtsc/testing/src/compiler_host.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {NgtscCompilerHost} from '../../file_system'; import {getCachedSourceFile} from './cached_source_files'; diff --git a/packages/compiler-cli/src/ngtsc/testing/src/utils.ts b/packages/compiler-cli/src/ngtsc/testing/src/utils.ts index fe72f5e67f7..e42386c37c6 100644 --- a/packages/compiler-cli/src/ngtsc/testing/src/utils.ts +++ b/packages/compiler-cli/src/ngtsc/testing/src/utils.ts @@ -8,7 +8,7 @@ /// -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, dirname, getFileSystem, getSourceFileOrError, NgtscCompilerHost} from '../../file_system'; import {DeclarationNode} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/transform/src/alias.ts b/packages/compiler-cli/src/ngtsc/transform/src/alias.ts index a5ba308a925..c0aab17b73d 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/alias.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/alias.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export function aliasTransformFactory(exportStatements: Map>): ts.TransformerFactory { diff --git a/packages/compiler-cli/src/ngtsc/transform/src/api.ts b/packages/compiler-cli/src/ngtsc/transform/src/api.ts index 5bffd37a086..816b9e0c0a8 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/api.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/api.ts @@ -7,7 +7,7 @@ */ import {ConstantPool, Expression, Statement, Type} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reexport} from '../../imports'; import {SemanticSymbol} from '../../incremental/semantic_graph'; diff --git a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts index 4f1d708275b..f2b269f7ba7 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/compilation.ts @@ -7,7 +7,7 @@ */ import {ConstantPool} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, FatalDiagnosticError} from '../../diagnostics'; import {IncrementalBuild} from '../../incremental/api'; diff --git a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts index 4adeee9ddbe..50a01892a89 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/declaration.ts @@ -7,7 +7,7 @@ */ import {Type} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportRewriter} from '../../imports'; import {ClassDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/transform/src/trait.ts b/packages/compiler-cli/src/ngtsc/transform/src/trait.ts index 65dc3ce3711..83c171619be 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/trait.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/trait.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {SemanticSymbol} from '../../incremental/semantic_graph'; import {DecoratorHandler, DetectResult} from './api'; diff --git a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts index fd52a15a1ec..ea66ceccf80 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/transform.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/transform.ts @@ -7,7 +7,7 @@ */ import {ConstantPool} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {DefaultImportTracker, ImportRewriter} from '../../imports'; import {getDefaultImportDeclaration} from '../../imports/src/default'; diff --git a/packages/compiler-cli/src/ngtsc/transform/src/utils.ts b/packages/compiler-cli/src/ngtsc/transform/src/utils.ts index 57f08b9fa6a..c7865127a38 100644 --- a/packages/compiler-cli/src/ngtsc/transform/src/utils.ts +++ b/packages/compiler-cli/src/ngtsc/transform/src/utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager} from '../../translator'; diff --git a/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts b/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts index 65a083308e1..264e112643d 100644 --- a/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts +++ b/packages/compiler-cli/src/ngtsc/translator/src/import_manager.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportRewriter, NoopImportRewriter} from '../../imports'; import {ImportGenerator, NamedImport} from './api/import_generator'; diff --git a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts index bd22bbf6bb4..96a28d1e5cb 100644 --- a/packages/compiler-cli/src/ngtsc/translator/src/translator.ts +++ b/packages/compiler-cli/src/ngtsc/translator/src/translator.ts @@ -6,7 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ import * as o from '@angular/compiler'; -import {createTaggedTemplate} from 'typescript'; import {AstFactory, BinaryOperator, ObjectLiteralProperty, SourceMapRange, TemplateElement, TemplateLiteral, UnaryOperator} from './api/ast_factory'; import {ImportGenerator} from './api/import_generator'; diff --git a/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts index de30be06cca..a8bea9a532f 100644 --- a/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts +++ b/packages/compiler-cli/src/ngtsc/translator/src/type_translator.ts @@ -7,7 +7,7 @@ */ import * as o from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Context} from './context'; import {ImportManager} from './import_manager'; diff --git a/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts b/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts index ebe0f3f0e30..b02254e3b44 100644 --- a/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts +++ b/packages/compiler-cli/src/ngtsc/translator/src/typescript_ast_factory.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AstFactory, BinaryOperator, LeadingComment, ObjectLiteralProperty, SourceMapRange, TemplateLiteral, UnaryOperator, VariableDeclarationType} from './api/ast_factory'; diff --git a/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts b/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts index 9fd0a1b5f52..8e8f932bfd3 100644 --- a/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts +++ b/packages/compiler-cli/src/ngtsc/translator/src/typescript_translator.ts @@ -7,7 +7,7 @@ */ import * as o from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportGenerator} from './api/import_generator'; import {Context} from './context'; diff --git a/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts b/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts index f213c2abc21..803e01797b2 100644 --- a/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts +++ b/packages/compiler-cli/src/ngtsc/translator/test/typescript_ast_factory_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {leadingComment} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptAstFactory} from '../src/typescript_ast_factory'; diff --git a/packages/compiler-cli/src/ngtsc/tsc_plugin.ts b/packages/compiler-cli/src/ngtsc/tsc_plugin.ts index 7f90bd12a7c..19c5b26b7ea 100644 --- a/packages/compiler-cli/src/ngtsc/tsc_plugin.ts +++ b/packages/compiler-cli/src/ngtsc/tsc_plugin.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {CompilationTicket, freshCompilationTicket, incrementalFromStateTicket, NgCompiler, NgCompilerHost} from './core'; import {NgCompilerOptions, UnifiedModulesHost} from './core/api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts index ce7c8778f6c..fc2cf31d366 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/api/api.ts @@ -7,7 +7,7 @@ */ import {AbsoluteSourceSpan, BoundTarget, DirectiveMeta, ParseSourceSpan, SchemaMetadata} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode} from '../../diagnostics'; import {AbsoluteFsPath} from '../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts index 2872b6f5fcc..b4485ebbbc1 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/api/checker.ts @@ -9,7 +9,7 @@ import {AST, Call, LiteralPrimitive, ParseSourceSpan, PropertyRead, SafePropertyRead, TmplAstElement, TmplAstNode, TmplAstTemplate} from '@angular/compiler'; import {AbsoluteFsPath} from '@angular/compiler-cli/src/ngtsc/file_system'; import {TextAttribute} from '@angular/compiler/src/render3/r3_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode} from '../../diagnostics'; import {FullTemplateMapping, NgTemplateDiagnostic, TypeCheckableDirectiveMeta} from './api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/context.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/context.ts index e738aa46b3f..ed5f5dbcf88 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/api/context.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/api/context.ts @@ -7,7 +7,7 @@ */ import {ParseError, ParseSourceFile, R3TargetBinder, SchemaMetadata, TmplAstNode} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {ClassDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/scope.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/scope.ts index 41dbe32c8bd..8535748d890 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/api/scope.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/api/scope.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration} from '../../reflection'; import {SymbolWithValueDeclaration} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts b/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts index 89b0f77aebf..bb1bb186e8f 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/api/symbols.ts @@ -7,7 +7,7 @@ */ import {TmplAstElement, TmplAstReference, TmplAstTemplate, TmplAstVariable} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {SymbolWithValueDeclaration} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts index 172c966ca8f..dbaaf842a52 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/diagnostic.ts @@ -7,7 +7,7 @@ */ import {ParseSourceSpan} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ExternalTemplateSourceMapping, TemplateDiagnostic, TemplateId, TemplateSourceMapping} from '../../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts index 22043f73a45..f2b8d630f95 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/diagnostics/src/id.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {DeclarationNode} from '../../../reflection'; import {TemplateId} from '../../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/api/api.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/api/api.ts index ef89a47904f..6fb59e1b23e 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/api/api.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/api/api.ts @@ -8,7 +8,7 @@ import {AST, RecursiveAstVisitor, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstBoundText, TmplAstContent, TmplAstElement, TmplAstIcu, TmplAstNode, TmplAstRecursiveVisitor, TmplAstReference, TmplAstTemplate, TmplAstText, TmplAstTextAttribute, TmplAstVariable} from '@angular/compiler'; import {ASTWithSource} from '@angular/compiler/src/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode} from '../../../diagnostics'; import {NgTemplateDiagnostic, TemplateTypeChecker} from '../../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/api/extended_template_checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/api/extended_template_checker.ts index 0db27bdc1a3..4af39c15c25 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/api/extended_template_checker.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/api/extended_template_checker.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {TemplateDiagnostic} from '../../api'; /** diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/invalid_banana_in_box/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/invalid_banana_in_box/index.ts index 1e129bf3592..c1f67c8652c 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/invalid_banana_in_box/index.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/invalid_banana_in_box/index.ts @@ -7,7 +7,7 @@ */ import {AST, TmplAstBoundEvent, TmplAstNode} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode} from '../../../../diagnostics'; import {NgTemplateDiagnostic} from '../../../api'; @@ -34,7 +34,7 @@ export class InvalidBananaInBoxCheck extends const diagnostic = ctx.templateTypeChecker.makeTemplateDiagnostic( component, node.sourceSpan, ts.DiagnosticCategory.Warning, ErrorCode.INVALID_BANANA_IN_BOX, `In the two-way binding syntax the parentheses should be inside the brackets, ex. '${ - expectedBoundSyntax}'. + expectedBoundSyntax}'. Find more at https://angular.io/guide/two-way-binding`); return [diagnostic]; } diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/nullish_coalescing_not_nullable/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/nullish_coalescing_not_nullable/index.ts index 60b0f7c8759..95662f3aabb 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/nullish_coalescing_not_nullable/index.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/checks/nullish_coalescing_not_nullable/index.ts @@ -7,7 +7,7 @@ */ import {AST, Binary, TmplAstNode} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode} from '../../../../diagnostics'; import {NgTemplateDiagnostic, SymbolKind} from '../../../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/src/extended_template_checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/src/extended_template_checker.ts index 6e1a3b6609c..fdc69f7f189 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/src/extended_template_checker.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/src/extended_template_checker.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode} from '../../../diagnostics'; import {TemplateDiagnostic, TemplateTypeChecker} from '../../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/invalid_banana_in_box_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/invalid_banana_in_box_spec.ts index 60e141ddd79..c6694b048fe 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/invalid_banana_in_box_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/invalid_banana_in_box/invalid_banana_in_box_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../../../../diagnostics'; import {absoluteFrom, getSourceFileOrError} from '../../../../../file_system'; import {runInEachFileSystem} from '../../../../../file_system/testing'; @@ -77,12 +77,12 @@ runInEachFileSystem(() => { const {program, templateTypeChecker} = setup([{ fileName, templates: { - 'TestCmp': `
+ 'TestCmp': `
Content to render when condition is false.
`, }, - source: `export class TestCmp { + source: `export class TestCmp { var1: string = "text"; }` }]); diff --git a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/nullish_coalescing_not_nullable_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/nullish_coalescing_not_nullable_spec.ts index a5a8141dfc1..5749eed42fb 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/nullish_coalescing_not_nullable_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/extended/test/checks/nullish_coalescing_not_nullable/nullish_coalescing_not_nullable_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../../../../diagnostics'; import {absoluteFrom, getSourceFileOrError} from '../../../../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts index bdbdc877e21..d1959b9fad7 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/checker.ts @@ -8,7 +8,7 @@ import {AST, CssSelector, DomElementSchemaRegistry, LiteralPrimitive, ParseSourceSpan, PropertyRead, SafePropertyRead, TmplAstElement, TmplAstNode, TmplAstReference, TmplAstTemplate} from '@angular/compiler'; import {TextAttribute} from '@angular/compiler/src/render3/r3_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../diagnostics'; import {absoluteFrom, absoluteFromSourceFile, AbsoluteFsPath, getSourceFileOrError} from '../../file_system'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts index 7e114f47740..fd9117ac8ce 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/comments.ts @@ -7,7 +7,7 @@ */ import {AbsoluteSourceSpan, ParseSourceSpan} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; const parseSpanComment = /^(\d+),(\d+)$/; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/completion.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/completion.ts index b3c04844b65..c84194d88ff 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/completion.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/completion.ts @@ -9,7 +9,7 @@ import {TmplAstReference, TmplAstTemplate} from '@angular/compiler'; import {AST, EmptyExpr, ImplicitReceiver, LiteralPrimitive, PropertyRead, PropertyWrite, SafePropertyRead, TmplAstNode} from '@angular/compiler/src/compiler'; import {TextAttribute} from '@angular/compiler/src/render3/r3_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {CompletionKind, GlobalCompletion, ReferenceCompletion, ShimLocation, VariableCompletion} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts index 991d01f4a7d..9f0a4f5548e 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/context.ts @@ -8,7 +8,7 @@ import {BoundTarget, ParseError, ParseSourceFile, R3TargetBinder, SchemaMetadata, TemplateParseError, TmplAstNode} from '@angular/compiler'; import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFromSourceFile, AbsoluteFsPath} from '../../file_system'; import {NoopImportRewriter, Reference, ReferenceEmitter} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts index 14b5c321bb7..ed422f54fb5 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/diagnostics.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {AbsoluteSourceSpan, ParseSourceSpan} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TemplateDiagnostic, TemplateId} from '../api'; import {makeTemplateDiagnostic} from '../diagnostics'; import {getTemplateMapping, TemplateSourceResolver} from './tcb_util'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts index b32d249748e..e436c52bb55 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/dom.ts @@ -7,7 +7,7 @@ */ import {DomElementSchemaRegistry, ParseSourceSpan, SchemaMetadata, TmplAstElement} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../diagnostics'; import {TemplateDiagnostic, TemplateId} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts index 2d2fdb734de..c8975b22e27 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/environment.ts @@ -7,7 +7,7 @@ */ import {ExpressionType, ExternalExpr, Type, WrappedNodeExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportFlags, Reference, ReferenceEmitter} from '../../imports'; import {ClassDeclaration, ReflectionHost} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts index fe4c99bc60f..80cf269587a 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/expression.ts @@ -7,7 +7,7 @@ */ import {AST, AstVisitor, ASTWithSource, Binary, BindingPipe, Call, Chain, Conditional, EmptyExpr, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, NonNullAssert, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeKeyedRead, SafePropertyRead, ThisReceiver, Unary} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeCheckingConfig} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts index 63199f50c81..a0f6cec2573 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/oob.ts @@ -8,7 +8,7 @@ import {BindingPipe, PropertyWrite, TmplAstBoundEvent, TmplAstElement, TmplAstReference, TmplAstVariable} from '@angular/compiler'; import {BoundAttribute} from '@angular/compiler/src/render3/r3_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, makeDiagnostic, makeRelatedInformation, ngErrorCode} from '../../diagnostics'; import {ClassDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/shim.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/shim.ts index 8f2c35090a1..92aab368312 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/shim.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/shim.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError} from '../../file_system'; import {PerFileShimGenerator, TopLevelShimGenerator} from '../../shims/api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts index 8bd68775764..e6d2c7d97e7 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/source.ts @@ -7,7 +7,7 @@ */ import {AbsoluteSourceSpan, ParseLocation, ParseSourceFile, ParseSourceSpan} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TemplateId, TemplateSourceMapping} from '../api'; import {getTemplateId} from '../diagnostics'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/tcb_util.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/tcb_util.ts index ace4cc8b2b3..d676b128a7a 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/tcb_util.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/tcb_util.ts @@ -8,7 +8,7 @@ import {AbsoluteSourceSpan, ParseSourceSpan} from '@angular/compiler'; import {ClassDeclaration, ReflectionHost} from '@angular/compiler-cli/src/ngtsc/reflection'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {getTokenAtPosition} from '../../util/src/typescript'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts index 0bed8ba2dab..656fc2d30ec 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/template_symbol_builder.ts @@ -7,7 +7,7 @@ */ import {AST, ASTWithSource, BindingPipe, Call, ParseSourceSpan, PropertyRead, PropertyWrite, SafePropertyRead, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstElement, TmplAstNode, TmplAstReference, TmplAstTemplate, TmplAstTextAttribute, TmplAstVariable} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath} from '../../file_system'; import {ClassDeclaration} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts index 8356fbd1f18..e5b5b3e3235 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/ts_util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration} from '../../reflection'; /** diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts index 077e60aeb10..f6b43967c63 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_block.ts @@ -8,7 +8,7 @@ import {AST, BindingPipe, BindingType, BoundTarget, Call, DYNAMIC_TYPE, ImplicitReceiver, ParsedEventType, ParseSourceSpan, PropertyRead, PropertyWrite, SchemaMetadata, ThisReceiver, TmplAstBoundAttribute, TmplAstBoundEvent, TmplAstBoundText, TmplAstElement, TmplAstIcu, TmplAstNode, TmplAstReference, TmplAstTemplate, TmplAstTextAttribute, TmplAstVariable} from '@angular/compiler'; import {SafePropertyRead} from '@angular/compiler/src/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; import {ClassPropertyName} from '../../metadata'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_file.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_file.ts index 6fffff4a056..562c26c0b3f 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_file.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_check_file.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, join} from '../../file_system'; import {NoopImportRewriter, Reference, ReferenceEmitter} from '../../imports'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts index e6d3927407f..fc8648f7279 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_constructor.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassDeclaration, ReflectionHost} from '../../reflection'; import {TypeCtorMetadata} from '../api'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts index b198be9f9f1..1621461ee37 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_emitter.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Reference} from '../../imports'; /** diff --git a/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts b/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts index 84ff67ee7b6..fd0fa274df7 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/src/type_parameter_emitter.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {OwningModule, Reference} from '../../imports'; import {DeclarationNode, ReflectionHost} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts index 69906794b28..fc061f4dd99 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/diagnostics_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem, TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/program_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/program_spec.ts index 263a9a3b313..0136a37e3ad 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/program_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/program_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts index cf0e5235338..3106ff9d548 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__completion_spec.ts @@ -7,7 +7,7 @@ */ import {TmplAstTemplate} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts index 40b9fa408bb..4063188af6a 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_checker__get_symbol_of_template_node_spec.ts @@ -8,7 +8,7 @@ import {ASTWithSource, Binary, BindingPipe, Conditional, Interpolation, PropertyRead, TmplAstBoundAttribute, TmplAstBoundText, TmplAstElement, TmplAstNode, TmplAstReference, TmplAstTemplate} from '@angular/compiler'; import {AST, LiteralArray, LiteralMap} from '@angular/compiler/src/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts index 1239d23eef5..ec8249fa08e 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_constructor_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getFileSystem, getSourceFileOrError, LogicalFileSystem, NgtscCompilerHost} from '../../file_system'; import {runInEachFileSystem, TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/type_parameter_emitter_spec.ts b/packages/compiler-cli/src/ngtsc/typecheck/test/type_parameter_emitter_spec.ts index 6179e4cb992..84c20a32317 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/test/type_parameter_emitter_spec.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/test/type_parameter_emitter_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../file_system'; import {runInEachFileSystem, TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts b/packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts index ebcdbbf74e0..76fa391fdfc 100644 --- a/packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts +++ b/packages/compiler-cli/src/ngtsc/typecheck/testing/index.ts @@ -7,7 +7,7 @@ */ import {CssSelector, ParseSourceFile, ParseSourceSpan, parseTemplate, R3TargetBinder, SchemaMetadata, SelectorMatcher, TmplAstElement, Type} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, getSourceFileOrError, LogicalFileSystem} from '../../file_system'; import {TestFile} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/ngtsc/util/src/typescript.ts b/packages/compiler-cli/src/ngtsc/util/src/typescript.ts index 10d7bd36f3d..52825f6c5d1 100644 --- a/packages/compiler-cli/src/ngtsc/util/src/typescript.ts +++ b/packages/compiler-cli/src/ngtsc/util/src/typescript.ts @@ -9,7 +9,7 @@ const TS = /\.tsx?$/i; const D_TS = /\.d\.ts$/i; -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, getFileSystem} from '../../file_system'; import {DeclarationNode} from '../../reflection'; diff --git a/packages/compiler-cli/src/ngtsc/util/src/visitor.ts b/packages/compiler-cli/src/ngtsc/util/src/visitor.ts index dac65adeed6..2cfe501d371 100644 --- a/packages/compiler-cli/src/ngtsc/util/src/visitor.ts +++ b/packages/compiler-cli/src/ngtsc/util/src/visitor.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Result type of visiting a node that's typically an entry in a list, which allows specifying that diff --git a/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts b/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts index 4a48cd328dd..037ff0ee2ee 100644 --- a/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts +++ b/packages/compiler-cli/src/ngtsc/util/test/visitor_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, getSourceFileOrError} from '../../file_system'; import {runInEachFileSystem} from '../../file_system/testing'; diff --git a/packages/compiler-cli/src/perform_compile.ts b/packages/compiler-cli/src/perform_compile.ts index f84f0e8ab93..39d10f49dd4 100644 --- a/packages/compiler-cli/src/perform_compile.ts +++ b/packages/compiler-cli/src/perform_compile.ts @@ -7,7 +7,7 @@ */ import {isSyntaxError, Position} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem, ReadonlyFileSystem, relative, resolve} from '../src/ngtsc/file_system'; import {NgCompilerOptions} from './ngtsc/core/api'; diff --git a/packages/compiler-cli/src/perform_watch.ts b/packages/compiler-cli/src/perform_watch.ts index 7002bbe59a8..b2c20afe191 100644 --- a/packages/compiler-cli/src/perform_watch.ts +++ b/packages/compiler-cli/src/perform_watch.ts @@ -8,7 +8,7 @@ import * as chokidar from 'chokidar'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Diagnostics, exitCodeFromResult, ParsedConfiguration, performCompilation, PerformCompilationResult, readConfiguration} from './perform_compile'; import * as api from './transformers/api'; diff --git a/packages/compiler-cli/src/tooling.ts b/packages/compiler-cli/src/tooling.ts index 01bfed3b805..80e3646426d 100644 --- a/packages/compiler-cli/src/tooling.ts +++ b/packages/compiler-cli/src/tooling.ts @@ -13,7 +13,7 @@ * Any changes to this file should be discussed with the Angular CLI team. */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptReflectionHost} from './ngtsc/reflection'; import {getDownlevelDecoratorsTransform} from './transformers/downlevel_decorators_transform'; diff --git a/packages/compiler-cli/src/transformers/api.ts b/packages/compiler-cli/src/transformers/api.ts index 33d98894545..0cda16b7ef3 100644 --- a/packages/compiler-cli/src/transformers/api.ts +++ b/packages/compiler-cli/src/transformers/api.ts @@ -7,7 +7,7 @@ */ import {GeneratedFile, ParseSourceSpan, Position} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ExtendedTsCompilerHost, NgCompilerOptions} from '../ngtsc/core/api'; diff --git a/packages/compiler-cli/src/transformers/compiler_host.ts b/packages/compiler-cli/src/transformers/compiler_host.ts index 185f92aa517..fa17484f5ec 100644 --- a/packages/compiler-cli/src/transformers/compiler_host.ts +++ b/packages/compiler-cli/src/transformers/compiler_host.ts @@ -8,7 +8,7 @@ import {AotCompilerHost, collectExternalReferences, EmitterVisitorContext, GeneratedFile, ParseSourceSpan, syntaxError, TypeScriptEmitter} from '@angular/compiler'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeCheckHost} from '../diagnostics/translate_diagnostics'; import {ModuleMetadata} from '../metadata/index'; diff --git a/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts b/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts index 627fa165094..6a595fe949f 100644 --- a/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts +++ b/packages/compiler-cli/src/transformers/downlevel_decorators_transform.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Decorator, ReflectionHost} from '../ngtsc/reflection'; import {isAliasImportDeclaration, loadIsReferencedAliasDeclarationPatch} from './patch_alias_reference_resolution'; diff --git a/packages/compiler-cli/src/transformers/entry_points.ts b/packages/compiler-cli/src/transformers/entry_points.ts index 6c2da9b1611..e3aebde1817 100644 --- a/packages/compiler-cli/src/transformers/entry_points.ts +++ b/packages/compiler-cli/src/transformers/entry_points.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {CompilerHost, CompilerOptions, Program} from './api'; diff --git a/packages/compiler-cli/src/transformers/i18n.ts b/packages/compiler-cli/src/transformers/i18n.ts index f2db15a0e85..a9507f51dca 100644 --- a/packages/compiler-cli/src/transformers/i18n.ts +++ b/packages/compiler-cli/src/transformers/i18n.ts @@ -8,7 +8,7 @@ import {MessageBundle, Serializer, Xliff, Xliff2, Xmb} from '@angular/compiler'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CompilerOptions} from './api'; diff --git a/packages/compiler-cli/src/transformers/inline_resources.ts b/packages/compiler-cli/src/transformers/inline_resources.ts index 4b927f6b8b4..fe04b0f0010 100644 --- a/packages/compiler-cli/src/transformers/inline_resources.ts +++ b/packages/compiler-cli/src/transformers/inline_resources.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isClassMetadata, isMetadataImportedSymbolReferenceExpression, isMetadataSymbolicCallExpression, MetadataObject, MetadataValue} from '../metadata/index'; diff --git a/packages/compiler-cli/src/transformers/lower_expressions.ts b/packages/compiler-cli/src/transformers/lower_expressions.ts index 8a5dc858e1c..12e0cea4347 100644 --- a/packages/compiler-cli/src/transformers/lower_expressions.ts +++ b/packages/compiler-cli/src/transformers/lower_expressions.ts @@ -7,7 +7,7 @@ */ import {createLoweredSymbol, isLoweredSymbol} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CollectorOptions, isMetadataGlobalReferenceExpression, MetadataCollector, MetadataValue, ModuleMetadata} from '../metadata/index'; diff --git a/packages/compiler-cli/src/transformers/metadata_cache.ts b/packages/compiler-cli/src/transformers/metadata_cache.ts index fc564292cd2..4134cadc1eb 100644 --- a/packages/compiler-cli/src/transformers/metadata_cache.ts +++ b/packages/compiler-cli/src/transformers/metadata_cache.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataCollector, MetadataValue, ModuleMetadata} from '../metadata/index'; diff --git a/packages/compiler-cli/src/transformers/metadata_reader.ts b/packages/compiler-cli/src/transformers/metadata_reader.ts index 3acebdd71c2..2515b293a3d 100644 --- a/packages/compiler-cli/src/transformers/metadata_reader.ts +++ b/packages/compiler-cli/src/transformers/metadata_reader.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {METADATA_VERSION, ModuleMetadata} from '../metadata'; diff --git a/packages/compiler-cli/src/transformers/node_emitter.ts b/packages/compiler-cli/src/transformers/node_emitter.ts index 67d907716d5..13ac550f2dc 100644 --- a/packages/compiler-cli/src/transformers/node_emitter.ts +++ b/packages/compiler-cli/src/transformers/node_emitter.ts @@ -7,7 +7,7 @@ */ import {AssertNotNull, BinaryOperator, BinaryOperatorExpr, BuiltinMethod, BuiltinVar, CastExpr, ClassStmt, CommaExpr, ConditionalExpr, DeclareFunctionStmt, DeclareVarStmt, ExpressionStatement, ExpressionVisitor, ExternalExpr, ExternalReference, FunctionExpr, IfStmt, InstantiateExpr, InvokeFunctionExpr, LeadingComment, leadingComment, LiteralArrayExpr, LiteralExpr, LiteralMapExpr, LocalizedString, NotExpr, ParseSourceFile, ParseSourceSpan, PartialModule, ReadKeyExpr, ReadPropExpr, ReadVarExpr, ReturnStatement, Statement, StatementVisitor, StmtModifier, TaggedTemplateExpr, ThrowStmt, TryCatchStmt, TypeofExpr, UnaryOperator, UnaryOperatorExpr, WrappedNodeExpr, WriteKeyExpr, WritePropExpr, WriteVarExpr} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {attachComments} from '../ngtsc/translator'; import {error} from './util'; diff --git a/packages/compiler-cli/src/transformers/node_emitter_transform.ts b/packages/compiler-cli/src/transformers/node_emitter_transform.ts index 043b6bcbecb..41bc9a782a4 100644 --- a/packages/compiler-cli/src/transformers/node_emitter_transform.ts +++ b/packages/compiler-cli/src/transformers/node_emitter_transform.ts @@ -7,7 +7,7 @@ */ import {GeneratedFile} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptNodeEmitter} from './node_emitter'; import {GENERATED_FILES, stripComment} from './util'; diff --git a/packages/compiler-cli/src/transformers/patch_alias_reference_resolution.ts b/packages/compiler-cli/src/transformers/patch_alias_reference_resolution.ts index 4f9932ca781..6491f93a887 100644 --- a/packages/compiler-cli/src/transformers/patch_alias_reference_resolution.ts +++ b/packages/compiler-cli/src/transformers/patch_alias_reference_resolution.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Describes a TypeScript transformation context with the internal emit diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts index 104f409d88e..08287c4779d 100644 --- a/packages/compiler-cli/src/transformers/program.ts +++ b/packages/compiler-cli/src/transformers/program.ts @@ -10,7 +10,7 @@ import {AotCompiler, AotCompilerOptions, core, createAotCompiler, FormattedMessageChain, GeneratedFile, getMissingNgModuleMetadataErrorData, getParseErrors, isFormattedError, isSyntaxError, MessageBundle, NgAnalyzedFileWithInjectables, NgAnalyzedModules, ParseSourceSpan, PartialModule} from '@angular/compiler'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {translateDiagnostics} from '../diagnostics/translate_diagnostics'; import {createBundleIndexHost, MetadataCollector} from '../metadata'; diff --git a/packages/compiler-cli/src/transformers/r3_metadata_transform.ts b/packages/compiler-cli/src/transformers/r3_metadata_transform.ts index f305b9bf68d..336e778ecb0 100644 --- a/packages/compiler-cli/src/transformers/r3_metadata_transform.ts +++ b/packages/compiler-cli/src/transformers/r3_metadata_transform.ts @@ -7,7 +7,7 @@ */ import {ClassStmt, PartialModule, Statement, StmtModifier} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {isClassMetadata, MetadataCollector, MetadataValue, ModuleMetadata} from '../metadata/index'; diff --git a/packages/compiler-cli/src/transformers/r3_transform.ts b/packages/compiler-cli/src/transformers/r3_transform.ts index cdd40e7c148..d08f641eb24 100644 --- a/packages/compiler-cli/src/transformers/r3_transform.ts +++ b/packages/compiler-cli/src/transformers/r3_transform.ts @@ -7,7 +7,7 @@ */ import {PartialModule, Statement, StaticSymbol} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {updateSourceFile} from './node_emitter'; diff --git a/packages/compiler-cli/src/transformers/util.ts b/packages/compiler-cli/src/transformers/util.ts index 47fdb141457..173dfc3d602 100644 --- a/packages/compiler-cli/src/transformers/util.ts +++ b/packages/compiler-cli/src/transformers/util.ts @@ -8,7 +8,7 @@ import {syntaxError} from '@angular/compiler'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CompilerOptions, DEFAULT_ERROR_CODE, Diagnostic, SOURCE} from './api'; diff --git a/packages/compiler-cli/src/typescript_support.ts b/packages/compiler-cli/src/typescript_support.ts index 36a6c80ed63..168ea725a79 100644 --- a/packages/compiler-cli/src/typescript_support.ts +++ b/packages/compiler-cli/src/typescript_support.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {compareVersions} from './diagnostics/typescript_version'; /** diff --git a/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts b/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts index d1e7475e80a..7ee96cc3ef4 100644 --- a/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts +++ b/packages/compiler-cli/test/compliance/linked/linked_compile_spec.ts @@ -5,10 +5,9 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {PluginObj, transformSync} from '@babel/core'; - import {needsLinking} from '../../../linker'; import {createEs2015LinkerPlugin} from '../../../linker/babel'; +import {PluginObj, transformSync} from '../../../linker/babel/src/babel_core'; import {AbsoluteFsPath, FileSystem} from '../../../src/ngtsc/file_system'; import {ConsoleLogger, LogLevel} from '../../../src/ngtsc/logging'; import {MapAndPath, RawSourceMap, SourceFileLoader} from '../../../src/ngtsc/sourcemaps'; diff --git a/packages/compiler-cli/test/compliance/test_helpers/compile_test.ts b/packages/compiler-cli/test/compliance/test_helpers/compile_test.ts index 70eda234f5c..ff201d70762 100644 --- a/packages/compiler-cli/test/compliance/test_helpers/compile_test.ts +++ b/packages/compiler-cli/test/compliance/test_helpers/compile_test.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {AbsoluteFsPath, FileSystem, PathManipulation, ReadonlyFileSystem} from '../../../src/ngtsc/file_system'; import {initMockFileSystem} from '../../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/test/diagnostics/check_types_spec.ts b/packages/compiler-cli/test/diagnostics/check_types_spec.ts index 13fff9ad356..7e6179d4ccb 100644 --- a/packages/compiler-cli/test/diagnostics/check_types_spec.ts +++ b/packages/compiler-cli/test/diagnostics/check_types_spec.ts @@ -10,7 +10,7 @@ import * as ng from '@angular/compiler-cli'; import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {expectNoDiagnostics, setup, TestSupport} from '../test_support'; diff --git a/packages/compiler-cli/test/metadata/bundler_spec.ts b/packages/compiler-cli/test/metadata/bundler_spec.ts index 1391485bc7e..6de44bd706e 100644 --- a/packages/compiler-cli/test/metadata/bundler_spec.ts +++ b/packages/compiler-cli/test/metadata/bundler_spec.ts @@ -7,7 +7,7 @@ */ import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {CompilerHostAdapter, MetadataBundler, MetadataBundlerHost} from '../../src/metadata/bundler'; import {MetadataCollector} from '../../src/metadata/collector'; diff --git a/packages/compiler-cli/test/metadata/collector_spec.ts b/packages/compiler-cli/test/metadata/collector_spec.ts index 71543fbd47c..35b145b886d 100644 --- a/packages/compiler-cli/test/metadata/collector_spec.ts +++ b/packages/compiler-cli/test/metadata/collector_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataCollector} from '../../src/metadata/collector'; import {ClassMetadata, ConstructorMetadata, isClassMetadata, isMetadataGlobalReferenceExpression, METADATA_VERSION, MetadataEntry, MetadataMap, MetadataSymbolicExpression, ModuleMetadata} from '../../src/metadata/schema'; diff --git a/packages/compiler-cli/test/metadata/evaluator_spec.ts b/packages/compiler-cli/test/metadata/evaluator_spec.ts index e14ab9765ca..2e73f144fb1 100644 --- a/packages/compiler-cli/test/metadata/evaluator_spec.ts +++ b/packages/compiler-cli/test/metadata/evaluator_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {Evaluator} from '../../src/metadata/evaluator'; import {Symbols} from '../../src/metadata/symbols'; diff --git a/packages/compiler-cli/test/metadata/symbols_spec.ts b/packages/compiler-cli/test/metadata/symbols_spec.ts index 4e1f9ba37ae..ddb2fd922c5 100644 --- a/packages/compiler-cli/test/metadata/symbols_spec.ts +++ b/packages/compiler-cli/test/metadata/symbols_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isMetadataGlobalReferenceExpression} from '../../src/metadata/schema'; import {Symbols} from '../../src/metadata/symbols'; diff --git a/packages/compiler-cli/test/metadata/typescript.mocks.ts b/packages/compiler-cli/test/metadata/typescript.mocks.ts index 657ac8ec607..dd77d39e1c1 100644 --- a/packages/compiler-cli/test/metadata/typescript.mocks.ts +++ b/packages/compiler-cli/test/metadata/typescript.mocks.ts @@ -8,7 +8,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; export interface Directory { [name: string]: (Directory|string); diff --git a/packages/compiler-cli/test/mocks.ts b/packages/compiler-cli/test/mocks.ts index 449be39decb..6003a72d4e1 100644 --- a/packages/compiler-cli/test/mocks.ts +++ b/packages/compiler-cli/test/mocks.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export type Entry = string|Directory; diff --git a/packages/compiler-cli/test/ngc_spec.ts b/packages/compiler-cli/test/ngc_spec.ts index aabca219a74..d81d9580970 100644 --- a/packages/compiler-cli/test/ngc_spec.ts +++ b/packages/compiler-cli/test/ngc_spec.ts @@ -8,7 +8,7 @@ import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {main, mainDiagnosticsForTest, readCommandLineAndConfiguration, watchMode} from '../src/main'; import {setup, stripAnsi} from './test_support'; diff --git a/packages/compiler-cli/test/ngtsc/env.ts b/packages/compiler-cli/test/ngtsc/env.ts index a8b608ed115..150b532717b 100644 --- a/packages/compiler-cli/test/ngtsc/env.ts +++ b/packages/compiler-cli/test/ngtsc/env.ts @@ -8,7 +8,7 @@ import {CustomTransformers, defaultGatherDiagnostics, Program} from '@angular/compiler-cli'; import * as api from '@angular/compiler-cli/src/transformers/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {createCompilerHost, createProgram} from '../../index'; import {mainXi18n} from '../../src/extract_i18n'; diff --git a/packages/compiler-cli/test/ngtsc/extended_template_diagnostics_spec.ts b/packages/compiler-cli/test/ngtsc/extended_template_diagnostics_spec.ts index e00e6fb3371..a46e766a927 100644 --- a/packages/compiler-cli/test/ngtsc/extended_template_diagnostics_spec.ts +++ b/packages/compiler-cli/test/ngtsc/extended_template_diagnostics_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../src/ngtsc/diagnostics'; import {runInEachFileSystem} from '../../src/ngtsc/file_system/testing'; import {getSourceCodeForDiagnostic, loadStandardTestFiles} from '../../src/ngtsc/testing'; @@ -31,8 +31,8 @@ runInEachFileSystem(() => { selector: 'test', template: '
', }) - class TestCmp { - bar: string = "text"; + class TestCmp { + bar: string = "text"; } `); @@ -50,8 +50,8 @@ runInEachFileSystem(() => { selector: 'test', templateUrl: './test.html', }) - class TestCmp { - bar: string = "text"; + class TestCmp { + bar: string = "text"; } `); @@ -74,8 +74,8 @@ runInEachFileSystem(() => { selector: 'test', template: '
', }) - class TestCmp { - bar: string = "text"; + class TestCmp { + bar: string = "text"; } `); @@ -92,8 +92,8 @@ runInEachFileSystem(() => { selector: 'test', template: '
', }) - class TestCmp { - bar: string = "text"; + class TestCmp { + bar: string = "text"; } `); @@ -111,8 +111,8 @@ runInEachFileSystem(() => { selector: 'test', template: '{{ bar ?? "foo" }}', }) - export class TestCmp { - bar: string = "text"; + export class TestCmp { + bar: string = "text"; } `); @@ -133,8 +133,8 @@ runInEachFileSystem(() => { selector: 'test', template: '{{ bar ?? "foo" }}', }) - export class TestCmp { - bar: string = undefined; + export class TestCmp { + bar: string = undefined; } `); diff --git a/packages/compiler-cli/test/ngtsc/incremental_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/incremental_typecheck_spec.ts index 275d5712407..72d0b1b1efb 100644 --- a/packages/compiler-cli/test/ngtsc/incremental_typecheck_spec.ts +++ b/packages/compiler-cli/test/ngtsc/incremental_typecheck_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {absoluteFrom} from '../../src/ngtsc/file_system'; import {runInEachFileSystem} from '../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts index d3ebe2f2af7..d8926e607e8 100644 --- a/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts +++ b/packages/compiler-cli/test/ngtsc/ngtsc_spec.ts @@ -7,7 +7,7 @@ */ import {platform} from 'os'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../src/ngtsc/diagnostics'; import {absoluteFrom} from '../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/test/ngtsc/scope_spec.ts b/packages/compiler-cli/test/ngtsc/scope_spec.ts index 3990c5cc861..4c59e76cf90 100644 --- a/packages/compiler-cli/test/ngtsc/scope_spec.ts +++ b/packages/compiler-cli/test/ngtsc/scope_spec.ts @@ -7,7 +7,7 @@ */ import {Diagnostic} from '@angular/compiler-cli'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../src/ngtsc/diagnostics'; import {runInEachFileSystem} from '../../src/ngtsc/file_system/testing'; diff --git a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts index a6c5d449544..eebcdacb53c 100644 --- a/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts +++ b/packages/compiler-cli/test/ngtsc/template_typecheck_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ErrorCode, ngErrorCode} from '../../src/ngtsc/diagnostics'; import {absoluteFrom as _, getFileSystem, getSourceFileOrError} from '../../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/test/perform_compile_spec.ts b/packages/compiler-cli/test/perform_compile_spec.ts index 1fbce64926d..9b6a405b641 100644 --- a/packages/compiler-cli/test/perform_compile_spec.ts +++ b/packages/compiler-cli/test/perform_compile_spec.ts @@ -7,7 +7,7 @@ */ import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {readConfiguration} from '../src/perform_compile'; diff --git a/packages/compiler-cli/test/perform_watch_spec.ts b/packages/compiler-cli/test/perform_watch_spec.ts index 1747d887886..d0f2a8cbfbe 100644 --- a/packages/compiler-cli/test/perform_watch_spec.ts +++ b/packages/compiler-cli/test/perform_watch_spec.ts @@ -9,7 +9,7 @@ import {ivyEnabled} from '@angular/private/testing'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import * as ng from '../index'; import {FileChangeEvent, performWatchCompilation} from '../src/perform_watch'; diff --git a/packages/compiler-cli/test/test_support.ts b/packages/compiler-cli/test/test_support.ts index c3b73b5a228..7eb6ebc87bf 100644 --- a/packages/compiler-cli/test/test_support.ts +++ b/packages/compiler-cli/test/test_support.ts @@ -8,7 +8,7 @@ /// import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import * as ng from '../index'; import {NodeJSFileSystem, setFileSystem} from '../src/ngtsc/file_system'; diff --git a/packages/compiler-cli/test/transformers/compiler_host_spec.ts b/packages/compiler-cli/test/transformers/compiler_host_spec.ts index 9780240f0ba..0e72c5b5e60 100644 --- a/packages/compiler-cli/test/transformers/compiler_host_spec.ts +++ b/packages/compiler-cli/test/transformers/compiler_host_spec.ts @@ -7,7 +7,7 @@ */ import * as compiler from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataCollector} from '../../src/metadata/collector'; import {CompilerHost, CompilerOptions, LibrarySummary} from '../../src/transformers/api'; diff --git a/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts b/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts index f99be72298b..acbb8894abe 100644 --- a/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts +++ b/packages/compiler-cli/test/transformers/downlevel_decorators_transform_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptReflectionHost} from '../../src/ngtsc/reflection'; import {getDownlevelDecoratorsTransform} from '../../src/transformers/downlevel_decorators_transform'; diff --git a/packages/compiler-cli/test/transformers/inline_resources_spec.ts b/packages/compiler-cli/test/transformers/inline_resources_spec.ts index 011bdeb4628..23e6e89f2b7 100644 --- a/packages/compiler-cli/test/transformers/inline_resources_spec.ts +++ b/packages/compiler-cli/test/transformers/inline_resources_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isClassMetadata, MetadataCollector} from '../../src/metadata/index'; import {getInlineResourcesTransformFactory, InlineResourcesMetadataTransformer} from '../../src/transformers/inline_resources'; diff --git a/packages/compiler-cli/test/transformers/lower_expressions_spec.ts b/packages/compiler-cli/test/transformers/lower_expressions_spec.ts index c6ae036c086..d3d983c2391 100644 --- a/packages/compiler-cli/test/transformers/lower_expressions_spec.ts +++ b/packages/compiler-cli/test/transformers/lower_expressions_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {MetadataCollector, ModuleMetadata} from '../../src/metadata/index'; import {getExpressionLoweringTransformFactory, LoweringRequest, LowerMetadataTransform, RequestLocationMap} from '../../src/transformers/lower_expressions'; diff --git a/packages/compiler-cli/test/transformers/metadata_reader_spec.ts b/packages/compiler-cli/test/transformers/metadata_reader_spec.ts index cc3694de406..ec941df1746 100644 --- a/packages/compiler-cli/test/transformers/metadata_reader_spec.ts +++ b/packages/compiler-cli/test/transformers/metadata_reader_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {METADATA_VERSION, MetadataCollector, ModuleMetadata} from '../../src/metadata'; import {MetadataReaderHost, readMetadata} from '../../src/transformers/metadata_reader'; diff --git a/packages/compiler-cli/test/transformers/node_emitter_spec.ts b/packages/compiler-cli/test/transformers/node_emitter_spec.ts index a7c80bd1fa0..0f1cf4bc939 100644 --- a/packages/compiler-cli/test/transformers/node_emitter_spec.ts +++ b/packages/compiler-cli/test/transformers/node_emitter_spec.ts @@ -8,7 +8,7 @@ import {ParseLocation, ParseSourceFile, ParseSourceSpan} from '@angular/compiler'; import * as o from '@angular/compiler/src/output/output_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptNodeEmitter} from '../../src/transformers/node_emitter'; import {Directory, MockAotContext, MockCompilerHost} from '../mocks'; diff --git a/packages/compiler-cli/test/transformers/program_spec.ts b/packages/compiler-cli/test/transformers/program_spec.ts index 32e80968ee9..b48d3038e86 100644 --- a/packages/compiler-cli/test/transformers/program_spec.ts +++ b/packages/compiler-cli/test/transformers/program_spec.ts @@ -9,7 +9,7 @@ import * as ng from '@angular/compiler-cli'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {formatDiagnostics} from '../../src/perform_compile'; import {CompilerHost, EmitFlags, LazyRoute} from '../../src/transformers/api'; diff --git a/packages/compiler-cli/test/transformers/r3_metadata_transform_spec.ts b/packages/compiler-cli/test/transformers/r3_metadata_transform_spec.ts index 20220d3ec8c..4a14c3b4300 100644 --- a/packages/compiler-cli/test/transformers/r3_metadata_transform_spec.ts +++ b/packages/compiler-cli/test/transformers/r3_metadata_transform_spec.ts @@ -7,7 +7,7 @@ */ import {ClassField, ClassMethod, ClassStmt, PartialModule, Statement, StmtModifier} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {isClassMetadata, MetadataCollector} from '../../src/metadata/index'; import {MetadataCache} from '../../src/transformers/metadata_cache'; diff --git a/packages/compiler-cli/test/transformers/r3_transform_spec.ts b/packages/compiler-cli/test/transformers/r3_transform_spec.ts index 911fcdcccd0..1f2a0e9359c 100644 --- a/packages/compiler-cli/test/transformers/r3_transform_spec.ts +++ b/packages/compiler-cli/test/transformers/r3_transform_spec.ts @@ -8,7 +8,7 @@ import {PartialModule} from '@angular/compiler'; import * as o from '@angular/compiler/src/output/output_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getAngularClassTransformerFactory} from '../../src/transformers/r3_transform'; import {Directory, MockAotContext, MockCompilerHost} from '../mocks'; diff --git a/packages/compiler/test/aot/compiler_spec.ts b/packages/compiler/test/aot/compiler_spec.ts index d4349396407..d034356e8ae 100644 --- a/packages/compiler/test/aot/compiler_spec.ts +++ b/packages/compiler/test/aot/compiler_spec.ts @@ -11,7 +11,7 @@ import {MetadataBundler} from '@angular/compiler-cli/src/metadata/bundler'; import {privateEntriesToIndex} from '@angular/compiler-cli/src/metadata/index_writer'; import {extractSourceMap, originalPositionFor} from '@angular/compiler/testing/src/output/source_map_util'; import {NodeFlags} from '@angular/core/src/view/index'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {arrayToMockDir, compile, EmittingCompilerHost, expectNoDiagnostics, isInBazel, MockAotCompilerHost, MockCompilerHost, MockDirectory, MockMetadataBundlerHost, settings, setup, toMockFileArray} from './test_util'; diff --git a/packages/compiler/test/aot/static_symbol_resolver_spec.ts b/packages/compiler/test/aot/static_symbol_resolver_spec.ts index 44381a986f5..e969d199ba0 100644 --- a/packages/compiler/test/aot/static_symbol_resolver_spec.ts +++ b/packages/compiler/test/aot/static_symbol_resolver_spec.ts @@ -9,7 +9,7 @@ import {StaticSymbol, StaticSymbolCache, StaticSymbolResolver, StaticSymbolResolverHost, Summary, SummaryResolver} from '@angular/compiler'; import {CollectorOptions, METADATA_VERSION} from '@angular/compiler-cli'; import {MetadataCollector} from '@angular/compiler-cli/src/metadata/collector'; -import * as ts from 'typescript'; +import ts from 'typescript'; // This matches .ts files but not .d.ts files. const TS_EXT = /(^.|(?!\.d)..)\.ts$/; diff --git a/packages/compiler/test/aot/test_util.ts b/packages/compiler/test/aot/test_util.ts index ad1f90ff9ee..18994d6abaf 100644 --- a/packages/compiler/test/aot/test_util.ts +++ b/packages/compiler/test/aot/test_util.ts @@ -14,7 +14,7 @@ import {getCachedSourceFile} from '@angular/compiler-cli/src/ngtsc/testing'; import {newArray} from '@angular/compiler/src/util'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; export interface MetadataProvider { getMetadata(source: ts.SourceFile): ModuleMetadata|undefined; diff --git a/packages/core/schematics/migrations/abstract-control-parent/util.ts b/packages/core/schematics/migrations/abstract-control-parent/util.ts index 37d5cbff8f5..da6965e4e99 100644 --- a/packages/core/schematics/migrations/abstract-control-parent/util.ts +++ b/packages/core/schematics/migrations/abstract-control-parent/util.ts @@ -7,7 +7,7 @@ */ import {normalize} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {isNullCheck, isSafeAccess} from '../../utils/typescript/nodes'; import {hasOneOfTypes, isNullableType} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/activated-route-snapshot-fragment/index.ts b/packages/core/schematics/migrations/activated-route-snapshot-fragment/index.ts index 29ef6f8fdc7..0338570dc19 100644 --- a/packages/core/schematics/migrations/activated-route-snapshot-fragment/index.ts +++ b/packages/core/schematics/migrations/activated-route-snapshot-fragment/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/activated-route-snapshot-fragment/util.ts b/packages/core/schematics/migrations/activated-route-snapshot-fragment/util.ts index 681882f39d9..aba86d849fe 100644 --- a/packages/core/schematics/migrations/activated-route-snapshot-fragment/util.ts +++ b/packages/core/schematics/migrations/activated-route-snapshot-fragment/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isNullCheck, isSafeAccess} from '../../utils/typescript/nodes'; import {hasOneOfTypes, isNullableType} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/can-activate-with-redirect-to/index.ts b/packages/core/schematics/migrations/can-activate-with-redirect-to/index.ts index ab6d8301898..3b5a564d34d 100644 --- a/packages/core/schematics/migrations/can-activate-with-redirect-to/index.ts +++ b/packages/core/schematics/migrations/can-activate-with-redirect-to/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/can-activate-with-redirect-to/util.ts b/packages/core/schematics/migrations/can-activate-with-redirect-to/util.ts index 04d33e185d4..f537f6a5906 100644 --- a/packages/core/schematics/migrations/can-activate-with-redirect-to/util.ts +++ b/packages/core/schematics/migrations/can-activate-with-redirect-to/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; const CAN_ACTIVATE = 'canActivate'; const REDIRECT_TO = 'redirectTo'; diff --git a/packages/core/schematics/migrations/dynamic-queries/index.ts b/packages/core/schematics/migrations/dynamic-queries/index.ts index 5f9c51f0e6e..265e7e9371e 100644 --- a/packages/core/schematics/migrations/dynamic-queries/index.ts +++ b/packages/core/schematics/migrations/dynamic-queries/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/dynamic-queries/util.ts b/packages/core/schematics/migrations/dynamic-queries/util.ts index 93faa7424ca..f5cd7c861ac 100644 --- a/packages/core/schematics/migrations/dynamic-queries/util.ts +++ b/packages/core/schematics/migrations/dynamic-queries/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getAngularDecorators} from '../../utils/ng_decorators'; /** diff --git a/packages/core/schematics/migrations/google3/activatedRouteSnapshotFragmentRule.ts b/packages/core/schematics/migrations/google3/activatedRouteSnapshotFragmentRule.ts index 23088f1991e..35d67753a9c 100644 --- a/packages/core/schematics/migrations/google3/activatedRouteSnapshotFragmentRule.ts +++ b/packages/core/schematics/migrations/google3/activatedRouteSnapshotFragmentRule.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {findFragmentAccesses, migrateActivatedRouteSnapshotFragment} from '../activated-route-snapshot-fragment/util'; diff --git a/packages/core/schematics/migrations/google3/canActivateWithRedirectToRule.ts b/packages/core/schematics/migrations/google3/canActivateWithRedirectToRule.ts index 4c45cf12a3b..b3ada7e001e 100644 --- a/packages/core/schematics/migrations/google3/canActivateWithRedirectToRule.ts +++ b/packages/core/schematics/migrations/google3/canActivateWithRedirectToRule.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {findLiteralsToMigrate, migrateLiteral} from '../can-activate-with-redirect-to/util'; diff --git a/packages/core/schematics/migrations/google3/dynamicQueriesRule.ts b/packages/core/schematics/migrations/google3/dynamicQueriesRule.ts index e5749253c38..42969743369 100644 --- a/packages/core/schematics/migrations/google3/dynamicQueriesRule.ts +++ b/packages/core/schematics/migrations/google3/dynamicQueriesRule.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {identifyDynamicQueryNodes, removeOptionsParameter, removeStaticFlag} from '../dynamic-queries/util'; diff --git a/packages/core/schematics/migrations/google3/explicitQueryTimingRule.ts b/packages/core/schematics/migrations/google3/explicitQueryTimingRule.ts index 35f9b918c01..667f929f454 100644 --- a/packages/core/schematics/migrations/google3/explicitQueryTimingRule.ts +++ b/packages/core/schematics/migrations/google3/explicitQueryTimingRule.ts @@ -8,7 +8,7 @@ import * as compiler from '@angular/compiler'; import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {NgComponentTemplateVisitor} from '../../utils/ng_component_template'; import {NgQueryResolveVisitor} from '../static-queries/angular/ng_query_visitor'; diff --git a/packages/core/schematics/migrations/google3/initialNavigationRule.ts b/packages/core/schematics/migrations/google3/initialNavigationRule.ts index a9c71f79054..c8186550ede 100644 --- a/packages/core/schematics/migrations/google3/initialNavigationRule.ts +++ b/packages/core/schematics/migrations/google3/initialNavigationRule.ts @@ -7,7 +7,7 @@ */ import {RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {InitialNavigationCollector} from '../initial-navigation/collector'; import {TslintUpdateRecorder} from '../initial-navigation/google3/tslint_update_recorder'; diff --git a/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts b/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts index 629b8ed98bb..f95c80ebb04 100644 --- a/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts +++ b/packages/core/schematics/migrations/google3/navigationExtrasOmissionsRule.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {findLiteralsToMigrate, migrateLiteral} from '../../migrations/navigation-extras-omissions/util'; diff --git a/packages/core/schematics/migrations/google3/noMissingInjectableRule.ts b/packages/core/schematics/migrations/google3/noMissingInjectableRule.ts index e9dedab1ba8..03290339021 100644 --- a/packages/core/schematics/migrations/google3/noMissingInjectableRule.ts +++ b/packages/core/schematics/migrations/google3/noMissingInjectableRule.ts @@ -7,7 +7,7 @@ */ import {RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {NgDefinitionCollector} from '../missing-injectable/definition_collector'; import {TslintUpdateRecorder} from '../missing-injectable/google3/tslint_update_recorder'; diff --git a/packages/core/schematics/migrations/google3/noTemplateVariableAssignmentRule.ts b/packages/core/schematics/migrations/google3/noTemplateVariableAssignmentRule.ts index c22a34b9b19..771bb5d47a2 100644 --- a/packages/core/schematics/migrations/google3/noTemplateVariableAssignmentRule.ts +++ b/packages/core/schematics/migrations/google3/noTemplateVariableAssignmentRule.ts @@ -8,7 +8,7 @@ import * as compiler from '@angular/compiler'; import {RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {NgComponentTemplateVisitor} from '../../utils/ng_component_template'; import {createHtmlSourceFile} from '../../utils/tslint/tslint_html_source_file'; diff --git a/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts b/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts index 4b3b45902b6..7b21c10dd2d 100644 --- a/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts +++ b/packages/core/schematics/migrations/google3/relativeLinkResolutionDefaultRule.ts @@ -7,7 +7,7 @@ */ import {RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {RelativeLinkResolutionCollector} from '../relative-link-resolution/collector'; import {TslintUpdateRecorder} from '../relative-link-resolution/google3/tslint_update_recorder'; diff --git a/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts b/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts index c848bc3d3bd..0182257933a 100644 --- a/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts +++ b/packages/core/schematics/migrations/google3/rendererToRenderer2Rule.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportSpecifier, replaceImport} from '../../utils/typescript/imports'; import {closestNode} from '../../utils/typescript/nodes'; diff --git a/packages/core/schematics/migrations/google3/undecoratedClassesWithDecoratedFieldsRule.ts b/packages/core/schematics/migrations/google3/undecoratedClassesWithDecoratedFieldsRule.ts index 32b777c5f93..3f7fd6d0b55 100644 --- a/packages/core/schematics/migrations/google3/undecoratedClassesWithDecoratedFieldsRule.ts +++ b/packages/core/schematics/migrations/google3/undecoratedClassesWithDecoratedFieldsRule.ts @@ -7,7 +7,7 @@ */ import {RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TslintUpdateRecorder} from '../undecorated-classes-with-decorated-fields/google3/tslint_update_recorder'; import {UndecoratedClassesWithDecoratedFieldsTransform} from '../undecorated-classes-with-decorated-fields/transform'; diff --git a/packages/core/schematics/migrations/google3/waitForAsyncRule.ts b/packages/core/schematics/migrations/google3/waitForAsyncRule.ts index de947f0cf39..9379380a0ac 100644 --- a/packages/core/schematics/migrations/google3/waitForAsyncRule.ts +++ b/packages/core/schematics/migrations/google3/waitForAsyncRule.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure, Rules} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {findAsyncReferences} from '../../migrations/wait-for-async/util'; import {getImportSpecifier, replaceImport} from '../../utils/typescript/imports'; diff --git a/packages/core/schematics/migrations/initial-navigation/collector.ts b/packages/core/schematics/migrations/initial-navigation/collector.ts index dff8c13166f..a1c3d9d6bcb 100644 --- a/packages/core/schematics/migrations/initial-navigation/collector.ts +++ b/packages/core/schematics/migrations/initial-navigation/collector.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isExtraOptions, isRouterModuleForRoot} from './util'; diff --git a/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts b/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts index 09497f62890..c861ff4b39c 100644 --- a/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts +++ b/packages/core/schematics/migrations/initial-navigation/google3/tslint_update_recorder.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UpdateRecorder} from '../update_recorder'; diff --git a/packages/core/schematics/migrations/initial-navigation/index.ts b/packages/core/schematics/migrations/initial-navigation/index.ts index 90be6fb389f..c31824e3b27 100644 --- a/packages/core/schematics/migrations/initial-navigation/index.ts +++ b/packages/core/schematics/migrations/initial-navigation/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; import {InitialNavigationCollector} from './collector'; diff --git a/packages/core/schematics/migrations/initial-navigation/transform.ts b/packages/core/schematics/migrations/initial-navigation/transform.ts index cecd85ccba0..07677fb74ce 100644 --- a/packages/core/schematics/migrations/initial-navigation/transform.ts +++ b/packages/core/schematics/migrations/initial-navigation/transform.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {UpdateRecorder} from './update_recorder'; diff --git a/packages/core/schematics/migrations/initial-navigation/update_recorder.ts b/packages/core/schematics/migrations/initial-navigation/update_recorder.ts index 82e17879687..6156375460f 100644 --- a/packages/core/schematics/migrations/initial-navigation/update_recorder.ts +++ b/packages/core/schematics/migrations/initial-navigation/update_recorder.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Update recorder interface that is used to transform source files in a non-colliding diff --git a/packages/core/schematics/migrations/initial-navigation/util.ts b/packages/core/schematics/migrations/initial-navigation/util.ts index d8a7c565624..6f8a5a36f02 100644 --- a/packages/core/schematics/migrations/initial-navigation/util.ts +++ b/packages/core/schematics/migrations/initial-navigation/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportOfIdentifier} from '../../utils/typescript/imports'; /** Determine whether a node is a ModuleWithProviders type reference node without a generic type */ diff --git a/packages/core/schematics/migrations/missing-injectable/definition_collector.ts b/packages/core/schematics/migrations/missing-injectable/definition_collector.ts index f0c90331859..dff28076095 100644 --- a/packages/core/schematics/migrations/missing-injectable/definition_collector.ts +++ b/packages/core/schematics/migrations/missing-injectable/definition_collector.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators'; import {getPropertyNameText} from '../../utils/typescript/property_name'; diff --git a/packages/core/schematics/migrations/missing-injectable/google3/tslint_update_recorder.ts b/packages/core/schematics/migrations/missing-injectable/google3/tslint_update_recorder.ts index 4445e07de8f..4ecdc52023c 100644 --- a/packages/core/schematics/migrations/missing-injectable/google3/tslint_update_recorder.ts +++ b/packages/core/schematics/migrations/missing-injectable/google3/tslint_update_recorder.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UpdateRecorder} from '../update_recorder'; diff --git a/packages/core/schematics/migrations/missing-injectable/index.ts b/packages/core/schematics/migrations/missing-injectable/index.ts index efead7fc070..09a024894b4 100644 --- a/packages/core/schematics/migrations/missing-injectable/index.ts +++ b/packages/core/schematics/migrations/missing-injectable/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; import {NgDefinitionCollector} from './definition_collector'; diff --git a/packages/core/schematics/migrations/missing-injectable/providers_evaluator.ts b/packages/core/schematics/migrations/missing-injectable/providers_evaluator.ts index 33aa309003f..b7078fec3a8 100644 --- a/packages/core/schematics/migrations/missing-injectable/providers_evaluator.ts +++ b/packages/core/schematics/migrations/missing-injectable/providers_evaluator.ts @@ -7,7 +7,7 @@ */ import {forwardRefResolver, ResolvedValue, StaticInterpreter} from '@angular/compiler-cli/private/migrations'; -import * as ts from 'typescript'; +import ts from 'typescript'; export interface ProviderLiteral { node: ts.ObjectLiteralExpression; diff --git a/packages/core/schematics/migrations/missing-injectable/transform.ts b/packages/core/schematics/migrations/missing-injectable/transform.ts index 1e57c823c4f..5fe528cd60f 100644 --- a/packages/core/schematics/migrations/missing-injectable/transform.ts +++ b/packages/core/schematics/migrations/missing-injectable/transform.ts @@ -7,7 +7,7 @@ */ import {DynamicValue, Reference, ResolvedValue, TypeScriptReflectionHost} from '@angular/compiler-cli/private/migrations'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager} from '../../utils/import_manager'; import {getAngularDecorators} from '../../utils/ng_decorators'; diff --git a/packages/core/schematics/migrations/missing-injectable/update_recorder.ts b/packages/core/schematics/migrations/missing-injectable/update_recorder.ts index bc1b7ed83d7..8dbb0789028 100644 --- a/packages/core/schematics/migrations/missing-injectable/update_recorder.ts +++ b/packages/core/schematics/migrations/missing-injectable/update_recorder.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManagerUpdateRecorder} from '../../utils/import_manager'; /** diff --git a/packages/core/schematics/migrations/module-with-providers/collector.ts b/packages/core/schematics/migrations/module-with-providers/collector.ts index f345282c628..39cc70e5476 100644 --- a/packages/core/schematics/migrations/module-with-providers/collector.ts +++ b/packages/core/schematics/migrations/module-with-providers/collector.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators'; diff --git a/packages/core/schematics/migrations/module-with-providers/index.ts b/packages/core/schematics/migrations/module-with-providers/index.ts index aad14dd3c93..946dc8df8d1 100644 --- a/packages/core/schematics/migrations/module-with-providers/index.ts +++ b/packages/core/schematics/migrations/module-with-providers/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicContext, SchematicsException, Tree, UpdateRecorder} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/module-with-providers/transform.ts b/packages/core/schematics/migrations/module-with-providers/transform.ts index 57ef0722721..02eb225bc5e 100644 --- a/packages/core/schematics/migrations/module-with-providers/transform.ts +++ b/packages/core/schematics/migrations/module-with-providers/transform.ts @@ -8,7 +8,7 @@ import {UpdateRecorder} from '@angular-devkit/schematics'; import {DynamicValue, PartialEvaluator, Reference, ResolvedValue, ResolvedValueMap, TypeScriptReflectionHost} from '@angular/compiler-cli/private/migrations'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ResolvedNgModule} from './collector'; import {createModuleWithProvidersType} from './util'; diff --git a/packages/core/schematics/migrations/module-with-providers/util.ts b/packages/core/schematics/migrations/module-with-providers/util.ts index 001d94c3e56..a76c906bee8 100644 --- a/packages/core/schematics/migrations/module-with-providers/util.ts +++ b/packages/core/schematics/migrations/module-with-providers/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportOfIdentifier} from '../../utils/typescript/imports'; /** Add a generic type to a type reference. */ diff --git a/packages/core/schematics/migrations/move-document/document_import_visitor.ts b/packages/core/schematics/migrations/move-document/document_import_visitor.ts index 43e2067eab5..f215bb776cb 100644 --- a/packages/core/schematics/migrations/move-document/document_import_visitor.ts +++ b/packages/core/schematics/migrations/move-document/document_import_visitor.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export const COMMON_IMPORT = '@angular/common'; export const PLATFORM_BROWSER_IMPORT = '@angular/platform-browser'; diff --git a/packages/core/schematics/migrations/move-document/index.ts b/packages/core/schematics/migrations/move-document/index.ts index 9815576949d..387d0569a77 100644 --- a/packages/core/schematics/migrations/move-document/index.ts +++ b/packages/core/schematics/migrations/move-document/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/move-document/move-import.ts b/packages/core/schematics/migrations/move-document/move-import.ts index c711725c79b..c7ef2610419 100644 --- a/packages/core/schematics/migrations/move-document/move-import.ts +++ b/packages/core/schematics/migrations/move-document/move-import.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export function removeFromImport( importNode: ts.NamedImports, sourceFile: ts.SourceFile, importName: string): string { diff --git a/packages/core/schematics/migrations/native-view-encapsulation/util.ts b/packages/core/schematics/migrations/native-view-encapsulation/util.ts index c7188b01d7e..4d56019d8ee 100644 --- a/packages/core/schematics/migrations/native-view-encapsulation/util.ts +++ b/packages/core/schematics/migrations/native-view-encapsulation/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportOfIdentifier} from '../../utils/typescript/imports'; diff --git a/packages/core/schematics/migrations/navigation-extras-omissions/index.ts b/packages/core/schematics/migrations/navigation-extras-omissions/index.ts index 32b134ac0b5..fe7eb998b7b 100644 --- a/packages/core/schematics/migrations/navigation-extras-omissions/index.ts +++ b/packages/core/schematics/migrations/navigation-extras-omissions/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/navigation-extras-omissions/util.ts b/packages/core/schematics/migrations/navigation-extras-omissions/util.ts index cdf8c3c4c9d..f6858a21163 100644 --- a/packages/core/schematics/migrations/navigation-extras-omissions/util.ts +++ b/packages/core/schematics/migrations/navigation-extras-omissions/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportSpecifier} from '../../utils/typescript/imports'; import {isReferenceToImport} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/relative-link-resolution/collector.ts b/packages/core/schematics/migrations/relative-link-resolution/collector.ts index 50c2d65b6c6..a47976ff67c 100644 --- a/packages/core/schematics/migrations/relative-link-resolution/collector.ts +++ b/packages/core/schematics/migrations/relative-link-resolution/collector.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isExtraOptions, isRouterModuleForRoot} from './util'; diff --git a/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts b/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts index f36e06d5b34..cbf73d8a1f1 100644 --- a/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts +++ b/packages/core/schematics/migrations/relative-link-resolution/google3/tslint_update_recorder.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UpdateRecorder} from '../update_recorder'; diff --git a/packages/core/schematics/migrations/relative-link-resolution/index.ts b/packages/core/schematics/migrations/relative-link-resolution/index.ts index 5b62dce311d..b0deb46b8c4 100644 --- a/packages/core/schematics/migrations/relative-link-resolution/index.ts +++ b/packages/core/schematics/migrations/relative-link-resolution/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; import {RelativeLinkResolutionCollector} from './collector'; diff --git a/packages/core/schematics/migrations/relative-link-resolution/transform.ts b/packages/core/schematics/migrations/relative-link-resolution/transform.ts index 91b2b4fb7df..844f012a695 100644 --- a/packages/core/schematics/migrations/relative-link-resolution/transform.ts +++ b/packages/core/schematics/migrations/relative-link-resolution/transform.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {UpdateRecorder} from './update_recorder'; diff --git a/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts b/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts index 82e17879687..6156375460f 100644 --- a/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts +++ b/packages/core/schematics/migrations/relative-link-resolution/update_recorder.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Update recorder interface that is used to transform source files in a non-colliding diff --git a/packages/core/schematics/migrations/relative-link-resolution/util.ts b/packages/core/schematics/migrations/relative-link-resolution/util.ts index d8a7c565624..6f8a5a36f02 100644 --- a/packages/core/schematics/migrations/relative-link-resolution/util.ts +++ b/packages/core/schematics/migrations/relative-link-resolution/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportOfIdentifier} from '../../utils/typescript/imports'; /** Determine whether a node is a ModuleWithProviders type reference node without a generic type */ diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/helpers.ts b/packages/core/schematics/migrations/renderer-to-renderer2/helpers.ts index a706d4ce53b..13a770b6692 100644 --- a/packages/core/schematics/migrations/renderer-to-renderer2/helpers.ts +++ b/packages/core/schematics/migrations/renderer-to-renderer2/helpers.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** Names of the helper functions that are supported for this migration. */ export const enum HelperFunction { diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/index.ts b/packages/core/schematics/migrations/renderer-to-renderer2/index.ts index 92724b63fc1..af563f68330 100644 --- a/packages/core/schematics/migrations/renderer-to-renderer2/index.ts +++ b/packages/core/schematics/migrations/renderer-to-renderer2/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {basename, join, relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts b/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts index 2711309f4a6..0922d6e1aaa 100644 --- a/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts +++ b/packages/core/schematics/migrations/renderer-to-renderer2/migration.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {HelperFunction} from './helpers'; diff --git a/packages/core/schematics/migrations/renderer-to-renderer2/util.ts b/packages/core/schematics/migrations/renderer-to-renderer2/util.ts index 3987cb64d55..269cb537a42 100644 --- a/packages/core/schematics/migrations/renderer-to-renderer2/util.ts +++ b/packages/core/schematics/migrations/renderer-to-renderer2/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportSpecifier} from '../../utils/typescript/imports'; import {isReferenceToImport} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/router-preserve-query-params/index.ts b/packages/core/schematics/migrations/router-preserve-query-params/index.ts index 590524a4ca5..3562ab1b472 100644 --- a/packages/core/schematics/migrations/router-preserve-query-params/index.ts +++ b/packages/core/schematics/migrations/router-preserve-query-params/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/router-preserve-query-params/util.ts b/packages/core/schematics/migrations/router-preserve-query-params/util.ts index c82282d4452..f8d92894bbb 100644 --- a/packages/core/schematics/migrations/router-preserve-query-params/util.ts +++ b/packages/core/schematics/migrations/router-preserve-query-params/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportSpecifier} from '../../utils/typescript/imports'; import {isReferenceToImport} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/static-queries/angular/directive_inputs.ts b/packages/core/schematics/migrations/static-queries/angular/directive_inputs.ts index 2db4ba34ec4..c5ef338f938 100644 --- a/packages/core/schematics/migrations/static-queries/angular/directive_inputs.ts +++ b/packages/core/schematics/migrations/static-queries/angular/directive_inputs.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getAngularDecorators} from '../../../utils/ng_decorators'; import {getPropertyNameText, hasPropertyNameText} from '../../../utils/typescript/property_name'; diff --git a/packages/core/schematics/migrations/static-queries/angular/ng_query_visitor.ts b/packages/core/schematics/migrations/static-queries/angular/ng_query_visitor.ts index 4edef20f48f..5328d438f54 100644 --- a/packages/core/schematics/migrations/static-queries/angular/ng_query_visitor.ts +++ b/packages/core/schematics/migrations/static-queries/angular/ng_query_visitor.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ResolvedTemplate} from '../../../utils/ng_component_template'; import {getAngularDecorators} from '../../../utils/ng_decorators'; diff --git a/packages/core/schematics/migrations/static-queries/angular/query-definition.ts b/packages/core/schematics/migrations/static-queries/angular/query-definition.ts index 88b6501613a..ac867762b06 100644 --- a/packages/core/schematics/migrations/static-queries/angular/query-definition.ts +++ b/packages/core/schematics/migrations/static-queries/angular/query-definition.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {NgDecorator} from '../../../utils/ng_decorators'; /** Timing of a given query. Either static or dynamic. */ diff --git a/packages/core/schematics/migrations/static-queries/angular/super_class.ts b/packages/core/schematics/migrations/static-queries/angular/super_class.ts index 2679e95253d..cc50c6389a2 100644 --- a/packages/core/schematics/migrations/static-queries/angular/super_class.ts +++ b/packages/core/schematics/migrations/static-queries/angular/super_class.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassMetadataMap} from './ng_query_visitor'; /** diff --git a/packages/core/schematics/migrations/static-queries/index.ts b/packages/core/schematics/migrations/static-queries/index.ts index 8d447d90335..2572698bcf8 100644 --- a/packages/core/schematics/migrations/static-queries/index.ts +++ b/packages/core/schematics/migrations/static-queries/index.ts @@ -9,7 +9,7 @@ import {logging} from '@angular-devkit/core'; import {Rule, SchematicContext, SchematicsException, Tree} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {loadEsmModule} from '../../utils/load_esm'; import {NgComponentTemplateVisitor} from '../../utils/ng_component_template'; diff --git a/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts b/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts index 9b1608e984f..36ad7d81a46 100644 --- a/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts +++ b/packages/core/schematics/migrations/static-queries/strategies/template_strategy/template_strategy.ts @@ -9,7 +9,7 @@ import type {AotCompiler, CompileDirectiveMetadata, CompileMetadataResolver, CompileNgModuleMetadata, CompileStylesheetMetadata, ElementAst, EmbeddedTemplateAst, NgAnalyzedModules, QueryMatch, StaticSymbol, TemplateAst} from '@angular/compiler'; import {createProgram, Diagnostic, readConfiguration} from '@angular/compiler-cli'; import {resolve} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ClassMetadataMap} from '../../angular/ng_query_visitor'; import {NgQueryDefinition, QueryTiming, QueryType} from '../../angular/query-definition'; diff --git a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.ts b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.ts index 0a06a6d3261..cda8ea8b388 100644 --- a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.ts +++ b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/declaration_usage_visitor.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isFunctionLikeDeclaration, unwrapExpression} from '../../../../utils/typescript/functions'; import {getPropertyNameText} from '../../../../utils/typescript/property_name'; diff --git a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.ts b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.ts index 15d283eb9b2..8e4e738ceec 100644 --- a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.ts +++ b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/super_class_context.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isFunctionLikeDeclaration} from '../../../../utils/typescript/functions'; import {hasModifier} from '../../../../utils/typescript/nodes'; diff --git a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts index d094de00d72..91423dae0d0 100644 --- a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts +++ b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {parseHtmlGracefully} from '../../../../utils/parse_html'; import {hasPropertyNameText} from '../../../../utils/typescript/property_name'; diff --git a/packages/core/schematics/migrations/static-queries/transform.ts b/packages/core/schematics/migrations/static-queries/transform.ts index 2b252db9453..69b179dd2af 100644 --- a/packages/core/schematics/migrations/static-queries/transform.ts +++ b/packages/core/schematics/migrations/static-queries/transform.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getPropertyNameText} from '../../utils/typescript/property_name'; import {NgQueryDefinition, QueryTiming} from './angular/query-definition'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/google3/tslint_update_recorder.ts b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/google3/tslint_update_recorder.ts index fe7144afd0a..4ca54b989e9 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/google3/tslint_update_recorder.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/google3/tslint_update_recorder.ts @@ -7,7 +7,7 @@ */ import {Replacement, RuleFailure} from 'tslint'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {UpdateRecorder} from '../update_recorder'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/index.ts b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/index.ts index 3b1c6f82b90..6a778fc5b43 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/index.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicContext, SchematicsException, Tree,} from '@angular-devkit/schematics'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/transform.ts b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/transform.ts index 55d64fd44c0..d774bda1b38 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/transform.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/transform.ts @@ -7,7 +7,7 @@ */ import {PartialEvaluator, reflectObjectLiteral, TypeScriptReflectionHost} from '@angular/compiler-cli/private/migrations'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager} from '../../utils/import_manager'; import {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.ts b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.ts index 82af928f995..baee6f67f70 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-decorated-fields/update_recorder.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManagerUpdateRecorder} from '../../utils/import_manager'; /** diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/create_ngc_program.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/create_ngc_program.ts index 502ad8403fb..16fba02bbe9 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/create_ngc_program.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/create_ngc_program.ts @@ -8,7 +8,7 @@ import type {AotCompiler} from '@angular/compiler'; import {CompilerHost, createProgram, readConfiguration} from '@angular/compiler-cli'; -import * as ts from 'typescript'; +import ts from 'typescript'; /** Creates an NGC program that can be used to read and parse metadata for files. */ export function createNgcProgram( diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.ts index ea17cdfab74..d70ec740b27 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/convert_directive_metadata.ts @@ -7,7 +7,7 @@ */ import type {StaticSymbol} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; /** Error that will be thrown if an unexpected value needs to be converted. */ export class UnexpectedMetadataValueError extends Error {} diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.ts index 678d6d04ced..3a59c76b44d 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/decorator_rewriter.ts @@ -8,7 +8,7 @@ */ import type {AotCompiler} from '@angular/compiler'; import {PartialEvaluator} from '@angular/compiler-cli/private/migrations'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager} from '../../../utils/import_manager'; import {NgDecorator} from '../../../utils/ng_decorators'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.ts index 4a1fff12daf..4f2f1698e43 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/import_rewrite_visitor.ts @@ -8,7 +8,7 @@ import type {AotCompilerHost} from '@angular/compiler'; import {dirname, resolve} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager} from '../../../utils/import_manager'; import {getImportOfIdentifier, Import} from '../../../utils/typescript/imports'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.ts index 1bce109faa1..93ae905421a 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/decorator_rewrite/source_file_exports.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getValueSymbolOfDeclaration} from '../../../utils/typescript/symbol'; export interface ResolvedExport { diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/index.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/index.ts index 85fc34b6aef..c7f942040f9 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/index.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/index.ts @@ -12,7 +12,7 @@ import type {AotCompiler} from '@angular/compiler'; import {Diagnostic as NgDiagnostic} from '@angular/compiler-cli'; import {PartialEvaluator, TypeScriptReflectionHost} from '@angular/compiler-cli/private/migrations'; import {relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {loadEsmModule} from '../../utils/load_esm'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.ts index ddca067d09f..bf3161e3711 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/ng_declaration_collector.ts @@ -7,7 +7,7 @@ */ import {PartialEvaluator, Reference, ResolvedValue} from '@angular/compiler-cli/private/migrations'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getAngularDecorators, NgDecorator} from '../../utils/ng_decorators'; import {getPropertyNameText} from '../../utils/typescript/property_name'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/transform.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/transform.ts index 52dc206c88a..dc260a19ec7 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/transform.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/transform.ts @@ -9,7 +9,7 @@ import type {AotCompiler, AotCompilerHost, CompileMetadataResolver, StaticSymbol, StaticSymbolResolver, SummaryResolver} from '@angular/compiler'; import {PartialEvaluator} from '@angular/compiler-cli/private/migrations'; import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManager} from '../../utils/import_manager'; import {getAngularDecorators} from '../../utils/ng_decorators'; diff --git a/packages/core/schematics/migrations/undecorated-classes-with-di/update_recorder.ts b/packages/core/schematics/migrations/undecorated-classes-with-di/update_recorder.ts index b1d0b195db1..b696373d6b8 100644 --- a/packages/core/schematics/migrations/undecorated-classes-with-di/update_recorder.ts +++ b/packages/core/schematics/migrations/undecorated-classes-with-di/update_recorder.ts @@ -7,7 +7,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {ImportManagerUpdateRecorder} from '../../utils/import_manager'; /** diff --git a/packages/core/schematics/migrations/wait-for-async/index.ts b/packages/core/schematics/migrations/wait-for-async/index.ts index da33a93ad6b..a9d3a326643 100644 --- a/packages/core/schematics/migrations/wait-for-async/index.ts +++ b/packages/core/schematics/migrations/wait-for-async/index.ts @@ -8,7 +8,7 @@ import {Rule, SchematicsException, Tree} from '@angular-devkit/schematics'; import {basename, join, relative} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getProjectTsConfigPaths} from '../../utils/project_tsconfig_paths'; import {canMigrateFile, createMigrationProgram} from '../../utils/typescript/compiler_host'; diff --git a/packages/core/schematics/migrations/wait-for-async/util.ts b/packages/core/schematics/migrations/wait-for-async/util.ts index bea02d98631..5e879dc5e4b 100644 --- a/packages/core/schematics/migrations/wait-for-async/util.ts +++ b/packages/core/schematics/migrations/wait-for-async/util.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {isReferenceToImport} from '../../utils/typescript/symbol'; diff --git a/packages/core/schematics/migrations/xhr-factory/index.ts b/packages/core/schematics/migrations/xhr-factory/index.ts index 919b56e1d57..58d28a5160c 100644 --- a/packages/core/schematics/migrations/xhr-factory/index.ts +++ b/packages/core/schematics/migrations/xhr-factory/index.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {DirEntry, Rule, UpdateRecorder} from '@angular-devkit/schematics'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {findImportSpecifier} from '../../utils/typescript/imports'; function* visit(directory: DirEntry): IterableIterator { diff --git a/packages/core/schematics/utils/import_manager.ts b/packages/core/schematics/utils/import_manager.ts index ab3d3cc4c73..fe932175d92 100644 --- a/packages/core/schematics/utils/import_manager.ts +++ b/packages/core/schematics/utils/import_manager.ts @@ -7,7 +7,7 @@ */ import {dirname, resolve} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; /** Update recorder for managing imports. */ export interface ImportManagerUpdateRecorder { diff --git a/packages/core/schematics/utils/ng_component_template.ts b/packages/core/schematics/utils/ng_component_template.ts index 34e8d2140ad..cc84653e3da 100644 --- a/packages/core/schematics/utils/ng_component_template.ts +++ b/packages/core/schematics/utils/ng_component_template.ts @@ -8,7 +8,7 @@ import {existsSync, readFileSync} from 'fs'; import {dirname, resolve} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {computeLineStartsMap, getLineAndCharacterFromPosition} from './line_mappings'; import {getAngularDecorators} from './ng_decorators'; diff --git a/packages/core/schematics/utils/ng_decorators.ts b/packages/core/schematics/utils/ng_decorators.ts index c34c2a191c6..43b4fa62bde 100644 --- a/packages/core/schematics/utils/ng_decorators.ts +++ b/packages/core/schematics/utils/ng_decorators.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getCallDecoratorImport} from './typescript/decorators'; export type CallExpressionDecorator = ts.Decorator&{ diff --git a/packages/core/schematics/utils/tslint/tslint_html_source_file.ts b/packages/core/schematics/utils/tslint/tslint_html_source_file.ts index bf4ad3bf80c..c09515cdcd6 100644 --- a/packages/core/schematics/utils/tslint/tslint_html_source_file.ts +++ b/packages/core/schematics/utils/tslint/tslint_html_source_file.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Creates a fake TypeScript source file that can contain content of templates or stylesheets. diff --git a/packages/core/schematics/utils/typescript/class_declaration.ts b/packages/core/schematics/utils/typescript/class_declaration.ts index 267b9e50c51..711c0e3d453 100644 --- a/packages/core/schematics/utils/typescript/class_declaration.ts +++ b/packages/core/schematics/utils/typescript/class_declaration.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** Determines the base type identifiers of a specified class declaration. */ export function getBaseTypeIdentifiers(node: ts.ClassDeclaration): ts.Identifier[]|null { diff --git a/packages/core/schematics/utils/typescript/compiler_host.ts b/packages/core/schematics/utils/typescript/compiler_host.ts index a4c159d65ae..3378262ceba 100644 --- a/packages/core/schematics/utils/typescript/compiler_host.ts +++ b/packages/core/schematics/utils/typescript/compiler_host.ts @@ -7,7 +7,7 @@ */ import {Tree} from '@angular-devkit/schematics'; import {dirname, relative, resolve} from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {parseTsconfigFile} from './parse_tsconfig'; export type FakeReadFileFn = (fileName: string) => string|undefined; diff --git a/packages/core/schematics/utils/typescript/decorators.ts b/packages/core/schematics/utils/typescript/decorators.ts index 6e37ed1d228..920e7e3924d 100644 --- a/packages/core/schematics/utils/typescript/decorators.ts +++ b/packages/core/schematics/utils/typescript/decorators.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getImportOfIdentifier, Import} from './imports'; diff --git a/packages/core/schematics/utils/typescript/find_base_classes.ts b/packages/core/schematics/utils/typescript/find_base_classes.ts index 01b634c9847..08837359f9c 100644 --- a/packages/core/schematics/utils/typescript/find_base_classes.ts +++ b/packages/core/schematics/utils/typescript/find_base_classes.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {getBaseTypeIdentifiers} from './class_declaration'; /** Gets all base class declarations of the specified class declaration. */ diff --git a/packages/core/schematics/utils/typescript/functions.ts b/packages/core/schematics/utils/typescript/functions.ts index 30b310629ff..f5baedd6c7b 100644 --- a/packages/core/schematics/utils/typescript/functions.ts +++ b/packages/core/schematics/utils/typescript/functions.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** Checks whether a given node is a function like declaration. */ export function isFunctionLikeDeclaration(node: ts.Node): node is ts.FunctionLikeDeclaration { diff --git a/packages/core/schematics/utils/typescript/imports.ts b/packages/core/schematics/utils/typescript/imports.ts index 1418021d5a7..fa672baba7b 100644 --- a/packages/core/schematics/utils/typescript/imports.ts +++ b/packages/core/schematics/utils/typescript/imports.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export type Import = { name: string, diff --git a/packages/core/schematics/utils/typescript/nodes.ts b/packages/core/schematics/utils/typescript/nodes.ts index f14f4ef46b8..1e82d6c249b 100644 --- a/packages/core/schematics/utils/typescript/nodes.ts +++ b/packages/core/schematics/utils/typescript/nodes.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** Checks whether the given TypeScript node has the specified modifier set. */ export function hasModifier(node: ts.Node, modifierKind: ts.SyntaxKind) { diff --git a/packages/core/schematics/utils/typescript/parse_tsconfig.ts b/packages/core/schematics/utils/typescript/parse_tsconfig.ts index 2788aea5df7..a5fb94a490d 100644 --- a/packages/core/schematics/utils/typescript/parse_tsconfig.ts +++ b/packages/core/schematics/utils/typescript/parse_tsconfig.ts @@ -7,7 +7,7 @@ */ import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; export function parseTsconfigFile(tsconfigPath: string, basePath: string): ts.ParsedCommandLine { const {config} = ts.readConfigFile(tsconfigPath, ts.sys.readFile); diff --git a/packages/core/schematics/utils/typescript/property_name.ts b/packages/core/schematics/utils/typescript/property_name.ts index 535d108d185..746d6ae48d4 100644 --- a/packages/core/schematics/utils/typescript/property_name.ts +++ b/packages/core/schematics/utils/typescript/property_name.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** Type that describes a property name with an obtainable text. */ type PropertyNameWithText = Exclude; diff --git a/packages/core/schematics/utils/typescript/symbol.ts b/packages/core/schematics/utils/typescript/symbol.ts index a63cc3a9896..b71236a9a09 100644 --- a/packages/core/schematics/utils/typescript/symbol.ts +++ b/packages/core/schematics/utils/typescript/symbol.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export function getValueSymbolOfDeclaration(node: ts.Node, typeChecker: ts.TypeChecker): ts.Symbol| undefined { diff --git a/packages/language-service/api.ts b/packages/language-service/api.ts index 54e7a15beec..2572ddb5140 100644 --- a/packages/language-service/api.ts +++ b/packages/language-service/api.ts @@ -12,7 +12,7 @@ * Entry point for all public APIs of the language service package. */ -import * as ts from 'typescript'; +import ts from 'typescript'; export interface PluginConfig { /** diff --git a/packages/language-service/ivy/attribute_completions.ts b/packages/language-service/ivy/attribute_completions.ts index 88e3ac0919f..a6f469b55ac 100644 --- a/packages/language-service/ivy/attribute_completions.ts +++ b/packages/language-service/ivy/attribute_completions.ts @@ -8,7 +8,7 @@ import {CssSelector, SelectorMatcher, TmplAstElement, TmplAstTemplate} from '@angular/compiler'; import {DirectiveInScope, ElementSymbol, TemplateSymbol, TemplateTypeChecker, TypeCheckableDirectiveMeta} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {DisplayInfoKind, unsafeCastDisplayInfoKindToScriptElementKind} from './display_parts'; import {makeElementSelector} from './utils'; diff --git a/packages/language-service/ivy/completions.ts b/packages/language-service/ivy/completions.ts index 1c2d9082dfe..333fcb07205 100644 --- a/packages/language-service/ivy/completions.ts +++ b/packages/language-service/ivy/completions.ts @@ -10,7 +10,7 @@ import {AST, BindingPipe, Call, EmptyExpr, ImplicitReceiver, LiteralPrimitive, P import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import {CompletionKind, DirectiveInScope, SymbolKind, TemplateDeclarationSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; import {BoundEvent, TextAttribute} from '@angular/compiler/src/render3/r3_ast'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {addAttributeCompletionEntries, AttributeCompletionKind, buildAttributeCompletionTable, getAttributeCompletionSymbol} from './attribute_completions'; import {DisplayInfo, DisplayInfoKind, getDirectiveDisplayInfo, getSymbolDisplayInfo, getTsSymbolDisplayInfo, unsafeCastDisplayInfoKindToScriptElementKind} from './display_parts'; diff --git a/packages/language-service/ivy/definitions.ts b/packages/language-service/ivy/definitions.ts index 257bd85cca8..d263f08796e 100644 --- a/packages/language-service/ivy/definitions.ts +++ b/packages/language-service/ivy/definitions.ts @@ -12,7 +12,7 @@ import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; import {isExternalResource} from '@angular/compiler-cli/src/ngtsc/metadata'; import {ProgramDriver} from '@angular/compiler-cli/src/ngtsc/program_driver'; import {DirectiveSymbol, DomBindingSymbol, ElementSymbol, ShimLocation, Symbol, SymbolKind, TemplateSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {convertToTemplateDocumentSpan} from './references_and_rename_utils'; import {getTargetAtPosition, TargetNodeKind} from './template_target'; diff --git a/packages/language-service/ivy/display_parts.ts b/packages/language-service/ivy/display_parts.ts index f948286bd39..a45d8b3a285 100644 --- a/packages/language-service/ivy/display_parts.ts +++ b/packages/language-service/ivy/display_parts.ts @@ -8,7 +8,7 @@ import {isNamedClassDeclaration} from '@angular/compiler-cli/src/ngtsc/reflection'; import {DirectiveInScope, ReferenceSymbol, ShimLocation, Symbol, SymbolKind, VariableSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; // Reverse mappings of enum would generate strings diff --git a/packages/language-service/ivy/quick_info.ts b/packages/language-service/ivy/quick_info.ts index a1afd83e1c8..8370d4f6389 100644 --- a/packages/language-service/ivy/quick_info.ts +++ b/packages/language-service/ivy/quick_info.ts @@ -8,7 +8,7 @@ import {AST, Call, ImplicitReceiver, PropertyRead, ThisReceiver, TmplAstBoundAttribute, TmplAstNode, TmplAstTextAttribute} from '@angular/compiler'; import {NgCompiler} from '@angular/compiler-cli/src/ngtsc/core'; import {DirectiveSymbol, DomBindingSymbol, ElementSymbol, InputBindingSymbol, OutputBindingSymbol, PipeSymbol, ReferenceSymbol, ShimLocation, Symbol, SymbolKind, VariableSymbol} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {createDisplayParts, DisplayInfoKind, SYMBOL_PUNC, SYMBOL_SPACE, SYMBOL_TEXT, unsafeCastDisplayInfoKindToScriptElementKind} from './display_parts'; import {filterAliasImports, getDirectiveMatchesForAttribute, getDirectiveMatchesForElementTag, getTextSpanOfNode} from './utils'; diff --git a/packages/language-service/ivy/references_and_rename.ts b/packages/language-service/ivy/references_and_rename.ts index eb024a05530..648d0f0d2a2 100644 --- a/packages/language-service/ivy/references_and_rename.ts +++ b/packages/language-service/ivy/references_and_rename.ts @@ -12,7 +12,7 @@ import {MetaType, PipeMeta} from '@angular/compiler-cli/src/ngtsc/metadata'; import {PerfPhase} from '@angular/compiler-cli/src/ngtsc/perf'; import {ProgramDriver} from '@angular/compiler-cli/src/ngtsc/program_driver'; import {SymbolKind} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {convertToTemplateDocumentSpan, createLocationKey, FilePosition, getParentClassMeta, getRenameTextAndSpanAtPosition, getTargetDetailsAtTemplatePosition, TemplateLocationDetails} from './references_and_rename_utils'; import {collectMemberMethods, findTightestNode} from './ts_utils'; diff --git a/packages/language-service/ivy/references_and_rename_utils.ts b/packages/language-service/ivy/references_and_rename_utils.ts index d28e225044d..1b99ef8387f 100644 --- a/packages/language-service/ivy/references_and_rename_utils.ts +++ b/packages/language-service/ivy/references_and_rename_utils.ts @@ -11,7 +11,7 @@ import {absoluteFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; import {DirectiveMeta, PipeMeta} from '@angular/compiler-cli/src/ngtsc/metadata'; import {DirectiveSymbol, ShimLocation, Symbol, SymbolKind, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; import {ExpressionIdentifier, hasExpressionIdentifier} from '@angular/compiler-cli/src/ngtsc/typecheck/src/comments'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getTargetAtPosition, TargetNodeKind} from './template_target'; import {findTightestNode, getParentClassDeclaration} from './ts_utils'; diff --git a/packages/language-service/ivy/test/completions_spec.ts b/packages/language-service/ivy/test/completions_spec.ts index a92af9198fc..41870024bba 100644 --- a/packages/language-service/ivy/test/completions_spec.ts +++ b/packages/language-service/ivy/test/completions_spec.ts @@ -7,7 +7,7 @@ */ import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {DisplayInfoKind, unsafeCastDisplayInfoKindToScriptElementKind} from '../display_parts'; import {LanguageServiceTestEnv, OpenBuffer} from '../testing'; diff --git a/packages/language-service/ivy/test/diagnostic_spec.ts b/packages/language-service/ivy/test/diagnostic_spec.ts index 4bffd146778..f3ad5ace398 100644 --- a/packages/language-service/ivy/test/diagnostic_spec.ts +++ b/packages/language-service/ivy/test/diagnostic_spec.ts @@ -8,7 +8,7 @@ import {ErrorCode, ngErrorCode} from '@angular/compiler-cli/src/ngtsc/diagnostics'; import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing'; @@ -370,8 +370,8 @@ describe('getSemanticDiagnostics', () => { selector: 'test', template: '
', }) - export class TestCmp { - bar: string = "text"; + export class TestCmp { + bar: string = "text"; } ` }; @@ -392,8 +392,8 @@ describe('getSemanticDiagnostics', () => { selector: 'test', template: '
', }) - export class TestCmp { - bar: string = "text"; + export class TestCmp { + bar: string = "text"; } ` }; @@ -411,8 +411,8 @@ describe('getSemanticDiagnostics', () => { selector: 'test', templateUrl: './app.html', }) - export class TestCmp { - bar: string = "text"; + export class TestCmp { + bar: string = "text"; } `, 'app.html': `
` @@ -435,8 +435,8 @@ describe('getSemanticDiagnostics', () => { selector: 'test', templateUrl: './app.html', }) - export class TestCmp { - bar: string = "text"; + export class TestCmp { + bar: string = "text"; } `, 'app.html': `
` diff --git a/packages/language-service/ivy/test/ts_utils_spec.ts b/packages/language-service/ivy/test/ts_utils_spec.ts index 6922a944970..a6b3abddf40 100644 --- a/packages/language-service/ivy/test/ts_utils_spec.ts +++ b/packages/language-service/ivy/test/ts_utils_spec.ts @@ -7,7 +7,7 @@ */ import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {LanguageServiceTestEnv, OpenBuffer, Project} from '../testing'; import {collectMemberMethods, findTightestNode} from '../ts_utils'; diff --git a/packages/language-service/ivy/ts_utils.ts b/packages/language-service/ivy/ts_utils.ts index 33c9b80acac..ca75e41f1b8 100644 --- a/packages/language-service/ivy/ts_utils.ts +++ b/packages/language-service/ivy/ts_utils.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; /** * Return the node that most tightly encompasses the specified `position`. diff --git a/packages/language-service/ivy/utils.ts b/packages/language-service/ivy/utils.ts index ee70e00535b..3e44d1ae92c 100644 --- a/packages/language-service/ivy/utils.ts +++ b/packages/language-service/ivy/utils.ts @@ -13,7 +13,7 @@ import {DeclarationNode} from '@angular/compiler-cli/src/ngtsc/reflection'; import {DirectiveSymbol, TemplateTypeChecker} from '@angular/compiler-cli/src/ngtsc/typecheck/api'; import * as e from '@angular/compiler/src/expression_parser/ast'; // e for expression AST import * as t from '@angular/compiler/src/render3/r3_ast'; // t for template AST -import * as ts from 'typescript'; +import ts from 'typescript'; import {ALIAS_NAME, SYMBOL_PUNC} from './display_parts'; import {findTightestNode, getParentClassDeclaration} from './ts_utils'; diff --git a/packages/language-service/src/definitions.ts b/packages/language-service/src/definitions.ts index 6a2653b50e1..7e92bf32dab 100644 --- a/packages/language-service/src/definitions.ts +++ b/packages/language-service/src/definitions.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; // used as value and is provided at runtime +import ts from 'typescript'; // used as value and is provided at runtime import {locateSymbols} from './locate_symbol'; import {findTightestNode, getClassDeclFromDecoratorProp, getPropertyAssignmentFromValue} from './ts_utils'; diff --git a/packages/language-service/src/diagnostic_messages.ts b/packages/language-service/src/diagnostic_messages.ts index 6d94bbaf0d2..48145cfe5b0 100644 --- a/packages/language-service/src/diagnostic_messages.ts +++ b/packages/language-service/src/diagnostic_messages.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import * as ng from './types'; export interface DiagnosticMessage { diff --git a/packages/language-service/src/diagnostics.ts b/packages/language-service/src/diagnostics.ts index 342a3585d79..2b2fa50a684 100644 --- a/packages/language-service/src/diagnostics.ts +++ b/packages/language-service/src/diagnostics.ts @@ -7,7 +7,7 @@ */ import {NgAnalyzedModules} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {createDiagnostic, Diagnostic} from './diagnostic_messages'; import {getTemplateExpressionDiagnostics} from './expression_diagnostics'; diff --git a/packages/language-service/src/hover.ts b/packages/language-service/src/hover.ts index 3130318a80d..e24db4be872 100644 --- a/packages/language-service/src/hover.ts +++ b/packages/language-service/src/hover.ts @@ -7,7 +7,7 @@ */ import {NgAnalyzedModules} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {locateSymbols} from './locate_symbol'; import * as ng from './types'; diff --git a/packages/language-service/src/reflector_host.ts b/packages/language-service/src/reflector_host.ts index af2e20b1d8d..149824a1f74 100644 --- a/packages/language-service/src/reflector_host.ts +++ b/packages/language-service/src/reflector_host.ts @@ -9,7 +9,7 @@ import {StaticSymbolResolverHost} from '@angular/compiler'; import {createMetadataReaderCache, MetadataCollector, MetadataReaderHost, readMetadata} from '@angular/compiler-cli/src/language_services'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; class ReflectorModuleModuleResolutionHost implements ts.ModuleResolutionHost, MetadataReaderHost { private readonly metadataCollector = new MetadataCollector({ diff --git a/packages/language-service/src/symbols.ts b/packages/language-service/src/symbols.ts index 585b743a7d9..7d291d3c7b4 100644 --- a/packages/language-service/src/symbols.ts +++ b/packages/language-service/src/symbols.ts @@ -7,7 +7,7 @@ */ import {StaticSymbol} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; /** diff --git a/packages/language-service/src/template.ts b/packages/language-service/src/template.ts index e3edbc721e3..076afcca208 100644 --- a/packages/language-service/src/template.ts +++ b/packages/language-service/src/template.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createGlobalSymbolTable} from './global_symbols'; import * as ng from './types'; diff --git a/packages/language-service/src/types.ts b/packages/language-service/src/types.ts index d024c2530da..f1370541649 100644 --- a/packages/language-service/src/types.ts +++ b/packages/language-service/src/types.ts @@ -7,7 +7,7 @@ */ import {CompileDirectiveMetadata, CompileDirectiveSummary, CompilePipeSummary, CssSelector, NgAnalyzedModules, Node as HtmlAst, ParseError, Parser, StaticSymbol, TemplateAst} from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Span, Symbol, SymbolQuery, SymbolTable} from './symbols'; diff --git a/packages/language-service/src/typescript_symbols.ts b/packages/language-service/src/typescript_symbols.ts index 12f9eb0d9ef..8fb95f1a981 100644 --- a/packages/language-service/src/typescript_symbols.ts +++ b/packages/language-service/src/typescript_symbols.ts @@ -8,7 +8,7 @@ import {CompilePipeSummary, StaticSymbol} from '@angular/compiler'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {BuiltinType, DeclarationKind, Definition, Signature, Span, Symbol, SymbolDeclaration, SymbolQuery, SymbolTable} from './symbols'; diff --git a/packages/language-service/test/completions_spec.ts b/packages/language-service/test/completions_spec.ts index d39324426fd..ec051085f3d 100644 --- a/packages/language-service/test/completions_spec.ts +++ b/packages/language-service/test/completions_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createLanguageService} from '../src/language_service'; import {CompletionKind} from '../src/types'; diff --git a/packages/language-service/test/definitions_spec.ts b/packages/language-service/test/definitions_spec.ts index 0a754d12fc0..8b2317f9588 100644 --- a/packages/language-service/test/definitions_spec.ts +++ b/packages/language-service/test/definitions_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createLanguageService} from '../src/language_service'; import {TypeScriptServiceHost} from '../src/typescript_host'; diff --git a/packages/language-service/test/diagnostic_messages_spec.ts b/packages/language-service/test/diagnostic_messages_spec.ts index 2409f0f4d20..ac9671825cf 100644 --- a/packages/language-service/test/diagnostic_messages_spec.ts +++ b/packages/language-service/test/diagnostic_messages_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createDiagnostic, DiagnosticMessage} from '../src/diagnostic_messages'; diff --git a/packages/language-service/test/diagnostics_spec.ts b/packages/language-service/test/diagnostics_spec.ts index 8397e655e10..19f3139f99d 100644 --- a/packages/language-service/test/diagnostics_spec.ts +++ b/packages/language-service/test/diagnostics_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createLanguageService} from '../src/language_service'; import {TypeScriptServiceHost} from '../src/typescript_host'; import {MockTypescriptHost} from './test_utils'; diff --git a/packages/language-service/test/expression_diagnostics_spec.ts b/packages/language-service/test/expression_diagnostics_spec.ts index cab7a9a6901..34b9333b4b5 100644 --- a/packages/language-service/test/expression_diagnostics_spec.ts +++ b/packages/language-service/test/expression_diagnostics_spec.ts @@ -9,7 +9,7 @@ import {StaticSymbol} from '@angular/compiler'; import {Directory} from '@angular/compiler-cli/test/mocks'; import {ReflectorHost} from '@angular/language-service/src/reflector_host'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getTemplateExpressionDiagnostics} from '../src/expression_diagnostics'; diff --git a/packages/language-service/test/hover_spec.ts b/packages/language-service/test/hover_spec.ts index 5116c42f09a..1d9d87c32bb 100644 --- a/packages/language-service/test/hover_spec.ts +++ b/packages/language-service/test/hover_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createLanguageService} from '../src/language_service'; import {TypeScriptServiceHost} from '../src/typescript_host'; diff --git a/packages/language-service/test/language_service_spec.ts b/packages/language-service/test/language_service_spec.ts index 46742f7cce8..171bd4329e8 100644 --- a/packages/language-service/test/language_service_spec.ts +++ b/packages/language-service/test/language_service_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createLanguageService} from '../src/language_service'; import {TypeScriptServiceHost} from '../src/typescript_host'; diff --git a/packages/language-service/test/mocks.ts b/packages/language-service/test/mocks.ts index 46d9ea432c6..4ea76eb4e21 100644 --- a/packages/language-service/test/mocks.ts +++ b/packages/language-service/test/mocks.ts @@ -12,7 +12,7 @@ import {setup} from '@angular/compiler-cli/test/test_support'; import {ViewEncapsulation, ɵConsole as Console} from '@angular/core'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {DiagnosticTemplateInfo} from '../src/types'; import {getClassMembers, getPipesTable, getSymbolQuery} from '../src/typescript_symbols'; diff --git a/packages/language-service/test/references_spec.ts b/packages/language-service/test/references_spec.ts index 0d9ab361007..8d43c3190d1 100644 --- a/packages/language-service/test/references_spec.ts +++ b/packages/language-service/test/references_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {createLanguageService} from '../src/language_service'; import {TypeScriptServiceHost} from '../src/typescript_host'; diff --git a/packages/language-service/test/reflector_host_spec.ts b/packages/language-service/test/reflector_host_spec.ts index 75f8ab964ba..96f1a10ac34 100644 --- a/packages/language-service/test/reflector_host_spec.ts +++ b/packages/language-service/test/reflector_host_spec.ts @@ -7,7 +7,7 @@ */ import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {ReflectorHost} from '../src/reflector_host'; import {TypeScriptServiceHost} from '../src/typescript_host'; diff --git a/packages/language-service/test/test_utils.ts b/packages/language-service/test/test_utils.ts index 39e7497e0a2..f18d0ab6fb2 100644 --- a/packages/language-service/test/test_utils.ts +++ b/packages/language-service/test/test_utils.ts @@ -10,7 +10,7 @@ import {CompileNgModuleMetadata, NgAnalyzedModules} from '@angular/compiler'; import {setup} from '@angular/compiler-cli/test/test_support'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {Span} from '../src/types'; diff --git a/packages/language-service/test/ts_plugin_spec.ts b/packages/language-service/test/ts_plugin_spec.ts index a6a4e506b89..9df941b12b9 100644 --- a/packages/language-service/test/ts_plugin_spec.ts +++ b/packages/language-service/test/ts_plugin_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; import {create, getExternalFiles} from '../src/ts_plugin'; import {CompletionKind} from '../src/types'; diff --git a/packages/language-service/test/typescript_host_spec.ts b/packages/language-service/test/typescript_host_spec.ts index ee4b7ed69c9..21156312894 100644 --- a/packages/language-service/test/typescript_host_spec.ts +++ b/packages/language-service/test/typescript_host_spec.ts @@ -7,7 +7,7 @@ */ import * as path from 'path'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {TypeScriptServiceHost} from '../src/typescript_host'; diff --git a/packages/language-service/test/typescript_symbols_spec.ts b/packages/language-service/test/typescript_symbols_spec.ts index 73dfb205644..6eaa2445d9c 100644 --- a/packages/language-service/test/typescript_symbols_spec.ts +++ b/packages/language-service/test/typescript_symbols_spec.ts @@ -8,7 +8,7 @@ import {Directory} from '@angular/compiler-cli/test/mocks'; import {ReflectorHost} from '@angular/language-service/src/reflector_host'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {BuiltinType, Symbol, SymbolQuery, SymbolTable} from '../src/symbols'; import {getSymbolQuery} from '../src/typescript_symbols'; diff --git a/packages/language-service/test/utils_spec.ts b/packages/language-service/test/utils_spec.ts index b29b7cccb02..d7ff22b4130 100644 --- a/packages/language-service/test/utils_spec.ts +++ b/packages/language-service/test/utils_spec.ts @@ -7,7 +7,7 @@ */ import * as ng from '@angular/compiler'; -import * as ts from 'typescript'; +import ts from 'typescript'; import {getClassDeclFromDecoratorProp, getDirectiveClassLike} from '../src/ts_utils'; import {getPathToNodeAtPosition} from '../src/utils'; diff --git a/packages/localize/package.json b/packages/localize/package.json index 1d437e09b99..9b4e83f2c40 100644 --- a/packages/localize/package.json +++ b/packages/localize/package.json @@ -35,7 +35,6 @@ ], "dependencies": { "@babel/core": "7.8.6", - "@babel/types": "7.8.6", "glob": "7.2.0", "yargs": "^17.0.0" }, diff --git a/packages/localize/tools/BUILD.bazel b/packages/localize/tools/BUILD.bazel index 07231f7355c..35ac1f2e5b4 100644 --- a/packages/localize/tools/BUILD.bazel +++ b/packages/localize/tools/BUILD.bazel @@ -15,7 +15,6 @@ ts_library( "//packages/compiler-cli/private", "//packages/localize", "@npm//@babel/core", - "@npm//@babel/types", "@npm//@types/babel__core", "@npm//@types/babel__traverse", "@npm//@types/glob", @@ -44,7 +43,6 @@ esbuild( "@angular/compiler", "@angular/compiler-cli/private/localize", "@babel/core", - "@babel/types", "yargs", "glob", ], diff --git a/packages/localize/tools/src/babel_core.ts b/packages/localize/tools/src/babel_core.ts new file mode 100644 index 00000000000..340bddf3006 --- /dev/null +++ b/packages/localize/tools/src/babel_core.ts @@ -0,0 +1,60 @@ +/** + * @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.io/license + */ + +/** + * This is an interop file allowing for `@babel/core` to be imported in both CommonJS or + * ES module files. The `@babel/core` package needs some special treatment because: + * + * Using a default import does not with CommonJS because the `@babel/core` package does not + * expose a `default` export at runtime (because it sets the `_esModule` property that causes + * TS to not create the necessary interop `default` export). On the other side, when loaded + * as part of an ESM, NodeJS will make all of the exports available as default export. + * + * Using named import bindings (i.e. namespace import or actual named bindings) is not + * working well for ESM because as said before, NodeJS will make all of the exports available + * as the `default` export. Hence ESM that imports CJS, always should use the default import. + * + * There is no solution that would work for both CJS and ESM, so we need to use a custom interop + * that switches between the named exports or the default exports depending on what is available. + * This allows the code to run in both ESM (for production) and CJS (for development). + * + * TODO(devversion): remove this once devmode uses ESM as well. + */ + +// tslint:disable-next-line +import * as _babelNamespace from '@babel/core'; +// tslint:disable-next-line +import _babelDefault from '@babel/core'; + +const babel: typeof _babelNamespace = _babelDefault ?? _babelNamespace; + +// We create an alias of the `types` namespace so that we can re-export the +// types namespace. Preserving the namespace is important so that types +// can still be referenced using a qualified name. +import _typesNamespace = _babelNamespace.types; + +// If the default export is available, we use its `types` runtime value +// for the type namespace we re-export. This is a trick we use to preserve +// the namespace types, while changing the runtime value of the namespace. +// TS complains about us assigning to a namespace but this is legal at runtime. +if (_babelDefault !== undefined) { + // @ts-ignore + _typesNamespace = _babelDefault.types; +} + +export import types = _typesNamespace; +export type PluginObj = _babelNamespace.PluginObj; +export type ConfigAPI = _babelNamespace.ConfigAPI; +export type NodePath = _babelNamespace.NodePath; +export type TransformOptions = _babelNamespace.TransformOptions; + +export const NodePath: typeof _babelNamespace.NodePath = babel.NodePath; +export const transformSync: typeof _babelNamespace.transformSync = babel.transformSync; +export const parseSync: typeof _babelNamespace.parseSync = babel.parseSync; +export const transformFromAstSync: typeof _babelNamespace.transformFromAstSync = + babel.transformFromAstSync; diff --git a/packages/localize/tools/src/extract/cli.ts b/packages/localize/tools/src/extract/cli.ts index 1422a7238bc..bd90d2e2ccd 100644 --- a/packages/localize/tools/src/extract/cli.ts +++ b/packages/localize/tools/src/extract/cli.ts @@ -8,8 +8,8 @@ */ import {ConsoleLogger, LogLevel, NodeJSFileSystem, setFileSystem} from '@angular/compiler-cli/private/localize'; -import * as glob from 'glob'; -import * as yargs from 'yargs'; +import glob from 'glob'; +import yargs from 'yargs'; import {DiagnosticHandlingStrategy} from '../diagnostics'; import {parseFormatOptions} from './translation_files/format_options'; diff --git a/packages/localize/tools/src/extract/extraction.ts b/packages/localize/tools/src/extract/extraction.ts index e6c23d7d2b3..9abdde50846 100644 --- a/packages/localize/tools/src/extract/extraction.ts +++ b/packages/localize/tools/src/extract/extraction.ts @@ -7,7 +7,7 @@ */ import {AbsoluteFsPath, Logger, ReadonlyFileSystem, SourceFile, SourceFileLoader} from '@angular/compiler-cli/private/localize'; import {ɵParsedMessage, ɵSourceLocation} from '@angular/localize'; -import {transformSync} from '@babel/core'; +import {transformSync} from '../babel_core'; import {makeEs2015ExtractPlugin} from './source_files/es2015_extract_plugin'; import {makeEs5ExtractPlugin} from './source_files/es5_extract_plugin'; diff --git a/packages/localize/tools/src/extract/source_files/es2015_extract_plugin.ts b/packages/localize/tools/src/extract/source_files/es2015_extract_plugin.ts index c6226925650..de13614ff1e 100644 --- a/packages/localize/tools/src/extract/source_files/es2015_extract_plugin.ts +++ b/packages/localize/tools/src/extract/source_files/es2015_extract_plugin.ts @@ -7,8 +7,7 @@ */ import {PathManipulation} from '@angular/compiler-cli/private/localize'; import {ɵParsedMessage, ɵparseMessage} from '@angular/localize'; -import {NodePath, PluginObj} from '@babel/core'; -import {TaggedTemplateExpression} from '@babel/types'; +import {NodePath, PluginObj, types as t} from '../../babel_core'; import {getLocation, isGlobalIdentifier, isNamedIdentifier, unwrapExpressionsFromTemplateLiteral, unwrapMessagePartsFromTemplateLiteral} from '../../source_file_utils'; @@ -16,7 +15,7 @@ export function makeEs2015ExtractPlugin( fs: PathManipulation, messages: ɵParsedMessage[], localizeName = '$localize'): PluginObj { return { visitor: { - TaggedTemplateExpression(path: NodePath) { + TaggedTemplateExpression(path: NodePath) { const tag = path.get('tag'); if (isNamedIdentifier(tag, localizeName) && isGlobalIdentifier(tag)) { const quasiPath = path.get('quasi'); diff --git a/packages/localize/tools/src/extract/source_files/es5_extract_plugin.ts b/packages/localize/tools/src/extract/source_files/es5_extract_plugin.ts index 1fae62a455b..74f394e7b35 100644 --- a/packages/localize/tools/src/extract/source_files/es5_extract_plugin.ts +++ b/packages/localize/tools/src/extract/source_files/es5_extract_plugin.ts @@ -7,8 +7,7 @@ */ import {PathManipulation} from '@angular/compiler-cli/private/localize'; import {ɵParsedMessage, ɵparseMessage} from '@angular/localize'; -import {NodePath, PluginObj} from '@babel/core'; -import {CallExpression} from '@babel/types'; +import {NodePath, PluginObj, types as t} from '../../babel_core'; import {buildCodeFrameError, getLocation, isBabelParseError, isGlobalIdentifier, isNamedIdentifier, unwrapMessagePartsFromLocalizeCall, unwrapSubstitutionsFromLocalizeCall} from '../../source_file_utils'; @@ -16,7 +15,7 @@ export function makeEs5ExtractPlugin( fs: PathManipulation, messages: ɵParsedMessage[], localizeName = '$localize'): PluginObj { return { visitor: { - CallExpression(callPath: NodePath) { + CallExpression(callPath: NodePath) { try { const calleePath = callPath.get('callee'); if (isNamedIdentifier(calleePath, localizeName) && isGlobalIdentifier(calleePath)) { diff --git a/packages/localize/tools/src/migrate/cli.ts b/packages/localize/tools/src/migrate/cli.ts index c0528662cab..18540490ec2 100644 --- a/packages/localize/tools/src/migrate/cli.ts +++ b/packages/localize/tools/src/migrate/cli.ts @@ -8,8 +8,8 @@ */ import {ConsoleLogger, LogLevel, NodeJSFileSystem, setFileSystem} from '@angular/compiler-cli/private/localize'; -import * as glob from 'glob'; -import * as yargs from 'yargs'; +import glob from 'glob'; +import yargs from 'yargs'; import {migrateFiles} from './index'; const args = process.argv.slice(2); diff --git a/packages/localize/tools/src/source_file_utils.ts b/packages/localize/tools/src/source_file_utils.ts index f77b6fd0f96..6f43b0a7ba0 100644 --- a/packages/localize/tools/src/source_file_utils.ts +++ b/packages/localize/tools/src/source_file_utils.ts @@ -8,8 +8,8 @@ import {AbsoluteFsPath, getFileSystem, PathManipulation} from '@angular/compiler-cli/private/localize'; import {ɵisMissingTranslationError, ɵmakeTemplateObject, ɵParsedTranslation, ɵSourceLocation, ɵtranslate} from '@angular/localize'; import {NodePath} from '@babel/traverse'; -import * as t from '@babel/types'; +import {types as t} from './babel_core'; import {DiagnosticHandlingStrategy, Diagnostics} from './diagnostics'; /** diff --git a/packages/localize/tools/src/translate/cli.ts b/packages/localize/tools/src/translate/cli.ts index c1724552bd1..0282c1df608 100644 --- a/packages/localize/tools/src/translate/cli.ts +++ b/packages/localize/tools/src/translate/cli.ts @@ -7,8 +7,8 @@ * found in the LICENSE file at https://angular.io/license */ import {NodeJSFileSystem, setFileSystem} from '@angular/compiler-cli/private/localize'; -import * as glob from 'glob'; -import * as yargs from 'yargs'; +import glob from 'glob'; +import yargs from 'yargs'; import {DiagnosticHandlingStrategy, Diagnostics} from '../diagnostics'; import {getOutputPathFn} from './output_path'; diff --git a/packages/localize/tools/src/translate/source_files/es2015_translate_plugin.ts b/packages/localize/tools/src/translate/source_files/es2015_translate_plugin.ts index cf349068884..2d0d6544342 100644 --- a/packages/localize/tools/src/translate/source_files/es2015_translate_plugin.ts +++ b/packages/localize/tools/src/translate/source_files/es2015_translate_plugin.ts @@ -7,8 +7,7 @@ */ import {getFileSystem, PathManipulation} from '@angular/compiler-cli/private/localize'; import {ɵParsedTranslation} from '@angular/localize'; -import {NodePath, PluginObj} from '@babel/core'; -import {TaggedTemplateExpression} from '@babel/types'; +import {NodePath, PluginObj, types as t} from '../../babel_core'; import {Diagnostics} from '../../diagnostics'; import {buildCodeFrameError, buildLocalizeReplacement, isBabelParseError, isLocalize, translate, TranslatePluginOptions, unwrapMessagePartsFromTemplateLiteral} from '../../source_file_utils'; @@ -25,7 +24,7 @@ export function makeEs2015TranslatePlugin( fs: PathManipulation = getFileSystem()): PluginObj { return { visitor: { - TaggedTemplateExpression(path: NodePath) { + TaggedTemplateExpression(path: NodePath) { try { const tag = path.get('tag'); if (isLocalize(tag, localizeName)) { diff --git a/packages/localize/tools/src/translate/source_files/es5_translate_plugin.ts b/packages/localize/tools/src/translate/source_files/es5_translate_plugin.ts index 29d618e03c8..19eba02b191 100644 --- a/packages/localize/tools/src/translate/source_files/es5_translate_plugin.ts +++ b/packages/localize/tools/src/translate/source_files/es5_translate_plugin.ts @@ -7,8 +7,7 @@ */ import {getFileSystem, PathManipulation} from '@angular/compiler-cli/private/localize'; import {ɵParsedTranslation} from '@angular/localize'; -import {NodePath, PluginObj} from '@babel/core'; -import {CallExpression} from '@babel/types'; +import {NodePath, PluginObj, types as t} from '../../babel_core'; import {Diagnostics} from '../../diagnostics'; import {buildCodeFrameError, buildLocalizeReplacement, isBabelParseError, isLocalize, translate, TranslatePluginOptions, unwrapMessagePartsFromLocalizeCall, unwrapSubstitutionsFromLocalizeCall} from '../../source_file_utils'; @@ -25,7 +24,7 @@ export function makeEs5TranslatePlugin( fs: PathManipulation = getFileSystem()): PluginObj { return { visitor: { - CallExpression(callPath: NodePath) { + CallExpression(callPath: NodePath) { try { const calleePath = callPath.get('callee'); if (isLocalize(calleePath, localizeName)) { diff --git a/packages/localize/tools/src/translate/source_files/locale_plugin.ts b/packages/localize/tools/src/translate/source_files/locale_plugin.ts index ed695837a9f..437e374fdb2 100644 --- a/packages/localize/tools/src/translate/source_files/locale_plugin.ts +++ b/packages/localize/tools/src/translate/source_files/locale_plugin.ts @@ -5,8 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {NodePath, PluginObj} from '@babel/core'; -import {MemberExpression, stringLiteral} from '@babel/types'; +import {NodePath, PluginObj, types as t} from '../../babel_core'; import {isLocalize, TranslatePluginOptions} from '../../source_file_utils'; @@ -27,7 +26,7 @@ export function makeLocalePlugin( locale: string, {localizeName = '$localize'}: TranslatePluginOptions = {}): PluginObj { return { visitor: { - MemberExpression(expression: NodePath) { + MemberExpression(expression: NodePath) { const obj = expression.get('object'); if (!isLocalize(obj, localizeName)) { return; @@ -59,7 +58,7 @@ export function makeLocalePlugin( } } // Replace the `$localize.locale` with the string literal - expression.replaceWith(stringLiteral(locale)); + expression.replaceWith(t.stringLiteral(locale)); } } }; diff --git a/packages/localize/tools/src/translate/source_files/source_file_translation_handler.ts b/packages/localize/tools/src/translate/source_files/source_file_translation_handler.ts index f9296ec52e9..2256042f806 100644 --- a/packages/localize/tools/src/translate/source_files/source_file_translation_handler.ts +++ b/packages/localize/tools/src/translate/source_files/source_file_translation_handler.ts @@ -6,8 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ import {absoluteFrom, AbsoluteFsPath, FileSystem, PathSegment} from '@angular/compiler-cli/private/localize'; -import {parseSync, transformFromAstSync} from '@babel/core'; -import {File, Program} from '@babel/types'; +import {parseSync, transformFromAstSync, types as t} from '../../babel_core'; import {Diagnostics} from '../../diagnostics'; import {TranslatePluginOptions} from '../../source_file_utils'; @@ -70,7 +69,7 @@ export class SourceFileTranslationHandler implements TranslationHandler { } private translateFile( - diagnostics: Diagnostics, ast: File|Program, translationBundle: TranslationBundle, + diagnostics: Diagnostics, ast: t.File|t.Program, translationBundle: TranslationBundle, sourceRoot: AbsoluteFsPath, filename: PathSegment, outputPathFn: OutputPathFn, options: TranslatePluginOptions) { const translated = transformFromAstSync(ast, undefined, { diff --git a/packages/localize/tools/test/BUILD.bazel b/packages/localize/tools/test/BUILD.bazel index e575065a6f6..940091cb3ff 100644 --- a/packages/localize/tools/test/BUILD.bazel +++ b/packages/localize/tools/test/BUILD.bazel @@ -17,11 +17,8 @@ ts_library( "//packages/localize/src/utils", "//packages/localize/tools", "//packages/localize/tools/test/helpers", - "@npm//@babel/core", "@npm//@babel/generator", "@npm//@babel/template", - "@npm//@babel/types", - "@npm//@types/babel__core", "@npm//@types/babel__generator", "@npm//@types/babel__template", "@npm//@types/glob", diff --git a/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts b/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts index a1eb1b4b682..0469aafce04 100644 --- a/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts +++ b/packages/localize/tools/test/extract/source_files/es5_extract_plugin_spec.ts @@ -8,7 +8,7 @@ */ import {FileSystem, getFileSystem, PathSegment, relativeFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; import {ɵParsedMessage} from '@angular/localize/private'; -import {transformSync} from '@babel/core'; +import {transformSync} from '../../../src/babel_core'; import {makeEs5ExtractPlugin} from '../../../src/extract/source_files/es5_extract_plugin'; import {runInNativeFileSystem} from '../../helpers'; diff --git a/packages/localize/tools/test/source_file_utils_spec.ts b/packages/localize/tools/test/source_file_utils_spec.ts index 4f36d9d9e79..08e2935dd05 100644 --- a/packages/localize/tools/test/source_file_utils_spec.ts +++ b/packages/localize/tools/test/source_file_utils_spec.ts @@ -7,10 +7,11 @@ */ import {absoluteFrom, getFileSystem, PathManipulation} from '@angular/compiler-cli/src/ngtsc/file_system'; import {ɵmakeTemplateObject} from '@angular/localize'; -import {NodePath, TransformOptions, transformSync} from '@babel/core'; import generate from '@babel/generator'; + +import {NodePath, TransformOptions, transformSync, types as t} from '../src/babel_core'; + import template from '@babel/template'; -import {Expression, Identifier, TaggedTemplateExpression, ExpressionStatement, CallExpression, isParenthesizedExpression, numericLiteral, binaryExpression, NumericLiteral} from '@babel/types'; import {isGlobalIdentifier, isNamedIdentifier, isStringLiteralArray, isArrayOfExpressions, unwrapStringLiteralArray, unwrapMessagePartsFromLocalizeCall, wrapInParensIfNecessary, buildLocalizeReplacement, unwrapSubstitutionsFromLocalizeCall, unwrapMessagePartsFromTemplateLiteral, getLocation} from '../src/source_file_utils'; import {runInNativeFileSystem} from './helpers'; @@ -40,36 +41,36 @@ runInNativeFileSystem(() => { describe('isGlobalIdentifier()', () => { it('should return true if the identifier is at the top level and not declared', () => { const taggedTemplate = getTaggedTemplate('$localize ``;'); - expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(true); + expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(true); }); it('should return true if the identifier is in a block scope and not declared', () => { const taggedTemplate = getTaggedTemplate('function foo() { $localize ``; } foo();'); - expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(true); + expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(true); }); it('should return false if the identifier is declared locally', () => { const taggedTemplate = getTaggedTemplate('function $localize() {} $localize ``;'); - expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(false); + expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(false); }); it('should return false if the identifier is a function parameter', () => { const taggedTemplate = getTaggedTemplate('function foo($localize) { $localize ``; }'); - expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(false); + expect(isGlobalIdentifier(taggedTemplate.get('tag') as NodePath)).toBe(false); }); }); describe('buildLocalizeReplacement', () => { it('should interleave the `messageParts` with the `substitutions`', () => { const messageParts = ɵmakeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']); - const substitutions = [numericLiteral(1), numericLiteral(2)]; + const substitutions = [t.numericLiteral(1), t.numericLiteral(2)]; const expression = buildLocalizeReplacement(messageParts, substitutions); expect(generate(expression).code).toEqual('"a" + 1 + "b" + 2 + "c"'); }); it('should wrap "binary expression" substitutions in parentheses', () => { const messageParts = ɵmakeTemplateObject(['a', 'b'], ['a', 'b']); - const binary = binaryExpression('+', numericLiteral(1), numericLiteral(2)); + const binary = t.binaryExpression('+', t.numericLiteral(1), t.numericLiteral(2)); const expression = buildLocalizeReplacement(messageParts, [binary]); expect(generate(expression).code).toEqual('"a" + (1 + 2) + "b"'); }); @@ -270,7 +271,7 @@ runInNativeFileSystem(() => { return _templateObject = function() { return e }, e } $localize(_templateObject(), 1, 2)`); - const localizeStatement = localizeCall.parentPath as NodePath; + const localizeStatement = localizeCall.parentPath as NodePath; const statements = localizeStatement.container as object[]; expect(statements.length).toEqual(2); unwrapMessagePartsFromLocalizeCall(localizeCall, fs); @@ -284,7 +285,7 @@ runInNativeFileSystem(() => { () => { const call = getLocalizeCall(`$localize(['a', 'b\t', 'c'], 1, 2)`); const [substitutions, locations] = unwrapSubstitutionsFromLocalizeCall(call, fs); - expect((substitutions as NumericLiteral[]).map(s => s.value)).toEqual([1, 2]); + expect((substitutions as t.NumericLiteral[]).map(s => s.value)).toEqual([1, 2]); expect(locations).toEqual([ { start: {line: 0, column: 28}, @@ -305,7 +306,7 @@ runInNativeFileSystem(() => { const call = getLocalizeCall( `$localize(__makeTemplateObject(['a', 'b', 'c'], ['a', 'b', 'c']), 1, 2)`); const [substitutions, locations] = unwrapSubstitutionsFromLocalizeCall(call, fs); - expect((substitutions as NumericLiteral[]).map(s => s.value)).toEqual([1, 2]); + expect((substitutions as t.NumericLiteral[]).map(s => s.value)).toEqual([1, 2]); expect(locations).toEqual([ { start: {line: 0, column: 66}, @@ -334,15 +335,15 @@ runInNativeFileSystem(() => { describe('wrapInParensIfNecessary', () => { it('should wrap the expression in parentheses if it is binary', () => { - const ast = template.ast`a + b` as ExpressionStatement; + const ast = template.ast`a + b` as t.ExpressionStatement; const wrapped = wrapInParensIfNecessary(ast.expression); - expect(isParenthesizedExpression(wrapped)).toBe(true); + expect(t.isParenthesizedExpression(wrapped)).toBe(true); }); it('should return the expression untouched if it is not binary', () => { - const ast = template.ast`a` as ExpressionStatement; + const ast = template.ast`a` as t.ExpressionStatement; const wrapped = wrapInParensIfNecessary(ast.expression); - expect(isParenthesizedExpression(wrapped)).toBe(false); + expect(t.isParenthesizedExpression(wrapped)).toBe(false); }); }); @@ -383,29 +384,29 @@ runInNativeFileSystem(() => { describe('isStringLiteralArray()', () => { it('should return true if the ast is an array of strings', () => { - const ast = template.ast`['a', 'b', 'c']` as ExpressionStatement; + const ast = template.ast`['a', 'b', 'c']` as t.ExpressionStatement; expect(isStringLiteralArray(ast.expression)).toBe(true); }); it('should return false if the ast is not an array', () => { - const ast = template.ast`'a'` as ExpressionStatement; + const ast = template.ast`'a'` as t.ExpressionStatement; expect(isStringLiteralArray(ast.expression)).toBe(false); }); it('should return false if at least on of the array elements is not a string', () => { - const ast = template.ast`['a', 1, 'b']` as ExpressionStatement; + const ast = template.ast`['a', 1, 'b']` as t.ExpressionStatement; expect(isStringLiteralArray(ast.expression)).toBe(false); }); }); describe('isArrayOfExpressions()', () => { it('should return true if all the nodes are expressions', () => { - const call = getFirstExpression('foo(a, b, c);'); + const call = getFirstExpression('foo(a, b, c);'); expect(isArrayOfExpressions(call.get('arguments'))).toBe(true); }); it('should return false if any of the nodes is not an expression', () => { - const call = getFirstExpression('foo(a, b, ...c);'); + const call = getFirstExpression('foo(a, b, ...c);'); expect(isArrayOfExpressions(call.get('arguments'))).toBe(false); }); }); @@ -436,26 +437,26 @@ runInNativeFileSystem(() => { }); function getTaggedTemplate( - code: string, options?: TransformOptions): NodePath { - return getExpressions(code, options) + code: string, options?: TransformOptions): NodePath { + return getExpressions(code, options) .find(e => e.isTaggedTemplateExpression())!; } -function getFirstExpression( +function getFirstExpression( code: string, options?: TransformOptions): NodePath { return getExpressions(code, options)[0]; } -function getExpressions( +function getExpressions( code: string, options?: TransformOptions): NodePath[] { - const expressions: NodePath[] = []; + const expressions: NodePath[] = []; transformSync(code, { code: false, filename: 'test/file.js', cwd: '/', plugins: [{ visitor: { - Expression: (path: NodePath) => { + Expression: (path: NodePath) => { expressions.push(path); } } @@ -465,8 +466,8 @@ function getExpressions( return expressions as NodePath[]; } -function getLocalizeCall(code: string): NodePath { - let callPaths: NodePath[] = []; +function getLocalizeCall(code: string): NodePath { + let callPaths: NodePath[] = []; transformSync(code, { code: false, filename: 'test/file.js', diff --git a/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts b/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts index 3e3b5300db5..ef144d2c330 100644 --- a/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts +++ b/packages/localize/tools/test/translate/source_files/es2015_translate_plugin_spec.ts @@ -8,7 +8,7 @@ import {FileSystem, getFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system'; import {ɵcomputeMsgId, ɵparseTranslation} from '@angular/localize'; import {ɵParsedTranslation} from '@angular/localize/private'; -import {transformSync} from '@babel/core'; +import {transformSync} from '../../../src/babel_core'; import {Diagnostics} from '../../../src/diagnostics'; import {TranslatePluginOptions} from '../../../src/source_file_utils'; diff --git a/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts b/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts index a562c250e30..897675ff093 100644 --- a/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts +++ b/packages/localize/tools/test/translate/source_files/es5_translate_plugin_spec.ts @@ -8,7 +8,7 @@ import {FileSystem, getFileSystem, PathSegment, relativeFrom} from '@angular/compiler-cli/src/ngtsc/file_system'; import {ɵcomputeMsgId, ɵparseTranslation} from '@angular/localize'; import {ɵParsedTranslation} from '@angular/localize/private'; -import {transformSync} from '@babel/core'; +import {transformSync} from '../../../src/babel_core'; import {Diagnostics} from '../../../src/diagnostics'; import {TranslatePluginOptions} from '../../../src/source_file_utils'; diff --git a/packages/localize/tools/test/translate/source_files/locale_plugin_spec.ts b/packages/localize/tools/test/translate/source_files/locale_plugin_spec.ts index 05bf5a096f5..7943f641168 100644 --- a/packages/localize/tools/test/translate/source_files/locale_plugin_spec.ts +++ b/packages/localize/tools/test/translate/source_files/locale_plugin_spec.ts @@ -5,7 +5,7 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {transformSync} from '@babel/core'; +import {transformSync} from '../../../src/babel_core'; import {makeLocalePlugin} from '../../../src/translate/source_files/locale_plugin'; describe('makeLocalePlugin', () => { diff --git a/tools/contributing-stats/get-data.ts b/tools/contributing-stats/get-data.ts index 69d81c275e6..b8f025f12f4 100644 --- a/tools/contributing-stats/get-data.ts +++ b/tools/contributing-stats/get-data.ts @@ -23,7 +23,7 @@ */ import {graphql as unauthenticatedGraphql} from '@octokit/graphql'; -import * as minimist from 'minimist'; +import minimist from 'minimist'; import {alias, params, query as graphqlQuery, types} from 'typed-graphqlify'; // The organization to be considered for the queries. diff --git a/tools/symbol-extractor/symbol_extractor.ts b/tools/symbol-extractor/symbol_extractor.ts index f56b1f5af91..7ba5aa8f4f7 100644 --- a/tools/symbol-extractor/symbol_extractor.ts +++ b/tools/symbol-extractor/symbol_extractor.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import * as ts from 'typescript'; +import ts from 'typescript'; export interface Symbol { diff --git a/tools/tslint/requireInternalWithUnderscoreRule.ts b/tools/tslint/requireInternalWithUnderscoreRule.ts index 3ce981bf8cb..d7c96b9a3bd 100644 --- a/tools/tslint/requireInternalWithUnderscoreRule.ts +++ b/tools/tslint/requireInternalWithUnderscoreRule.ts @@ -9,7 +9,7 @@ import {RuleFailure} from 'tslint/lib'; import {RuleWalker} from 'tslint/lib/language/walker'; import {AbstractRule} from 'tslint/lib/rules'; -import * as ts from 'typescript'; +import ts from 'typescript'; export class Rule extends AbstractRule { override apply(sourceFile: ts.SourceFile): RuleFailure[] {