From eb71e7398002e7792ce2ecef76fa3cb29f02389f Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Thu, 9 Mar 2017 17:23:53 -0800 Subject: [PATCH] Revert changes for export statements of common files. Fixes #296 --- lib/angular2.dart | 5 ++++- lib/common.dart | 5 ++++- lib/src/common.dart | 4 ---- lib/src/platform/browser_common.dart | 2 +- test/common/control_mocks.dart | 2 +- test/common/directives/ng_class_test.dart | 2 +- test/common/forms/directives_test.dart | 2 +- test/common/forms/form_builder_test.dart | 2 +- test/common/forms/integration_test.dart | 2 +- test/common/forms/model_test.dart | 2 +- test/common/forms/validators_test.dart | 3 +-- test/core/linker/change_detection_integration_test.dart | 2 +- test/core/linker/integration_test.dart | 2 +- test/core/linker/query_integration_test.dart | 2 +- test/core/linker/regression_integration_test.dart | 2 +- test/core/linker/view_injector_integration_test.dart | 2 +- 16 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 lib/src/common.dart diff --git a/lib/angular2.dart b/lib/angular2.dart index ce1792b60..cd94a2ea5 100644 --- a/lib/angular2.dart +++ b/lib/angular2.dart @@ -25,7 +25,10 @@ export 'package:angular2/src/compiler/directive_resolver.dart'; export 'package:angular2/src/compiler/view_resolver.dart'; // Used to be package:angular2/common.dart. -export "src/common.dart"; +export "src/common/common_directives.dart"; +export "src/common/directives.dart"; +export "src/common/forms.dart"; +export "src/common/pipes.dart"; /// TODO(ferhat): Remove once dynamic(s) are changed in codegen and class. /// This prevents unused import error in dart_analyzed_library build. diff --git a/lib/common.dart b/lib/common.dart index 8debf17a8..89f6d1810 100644 --- a/lib/common.dart +++ b/lib/common.dart @@ -1,4 +1,7 @@ @Deprecated('Import package:angular2/angular2.dart instead') library angular2.common; -export 'src/common.dart'; +export "src/common/common_directives.dart"; +export "src/common/directives.dart"; +export "src/common/forms.dart"; +export "src/common/pipes.dart"; diff --git a/lib/src/common.dart b/lib/src/common.dart deleted file mode 100644 index ae7bb81e5..000000000 --- a/lib/src/common.dart +++ /dev/null @@ -1,4 +0,0 @@ -export "common/common_directives.dart"; -export "common/directives.dart"; -export "common/forms.dart"; -export "common/pipes.dart"; diff --git a/lib/src/platform/browser_common.dart b/lib/src/platform/browser_common.dart index 6451be47e..f74adb31b 100644 --- a/lib/src/platform/browser_common.dart +++ b/lib/src/platform/browser_common.dart @@ -7,7 +7,7 @@ import "package:angular2/core.dart" APPLICATION_COMMON_PROVIDERS, PLATFORM_COMMON_PROVIDERS, TestabilityRegistry; -import 'package:angular2/src/common.dart' +import 'package:angular2/common.dart' show COMMON_DIRECTIVES, COMMON_PIPES, FORM_PROVIDERS; import "package:angular2/src/compiler/xhr.dart" show XHR; import "package:angular2/src/core/di.dart" show Injectable, Provider; diff --git a/test/common/control_mocks.dart b/test/common/control_mocks.dart index fb612b663..6f7978df5 100644 --- a/test/common/control_mocks.dart +++ b/test/common/control_mocks.dart @@ -1,6 +1,6 @@ library angular2.test.common.forms.control_mocks; -import 'package:angular2/src/common.dart'; +import 'package:angular2/common.dart'; import 'package:angular2/src/core/change_detection/change_detection.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/common/directives/ng_class_test.dart b/test/common/directives/ng_class_test.dart index 06083d076..6d1fe3690 100644 --- a/test/common/directives/ng_class_test.dart +++ b/test/common/directives/ng_class_test.dart @@ -2,7 +2,7 @@ library angular2.test.common.directives.ng_class_test; import "package:angular2/core.dart" show Component; -import 'package:angular2/src/common.dart' show NgFor; +import 'package:angular2/common.dart' show NgFor; import "package:angular2/src/common/directives/ng_class.dart"; import "package:angular2/testing_internal.dart"; import 'package:test/test.dart'; diff --git a/test/common/forms/directives_test.dart b/test/common/forms/directives_test.dart index 000d7b4f0..dc94ef35d 100644 --- a/test/common/forms/directives_test.dart +++ b/test/common/forms/directives_test.dart @@ -1,7 +1,7 @@ @TestOn('browser') import 'dart:html'; -import 'package:angular2/src/common.dart' +import 'package:angular2/common.dart' show AbstractControl, ControlGroup, diff --git a/test/common/forms/form_builder_test.dart b/test/common/forms/form_builder_test.dart index 400b515b3..57135f3e5 100644 --- a/test/common/forms/form_builder_test.dart +++ b/test/common/forms/form_builder_test.dart @@ -3,7 +3,7 @@ library angular2.test.common.forms.form_builder_test; import 'dart:async'; -import 'package:angular2/src/common.dart' show FormBuilder, AbstractControl; +import 'package:angular2/common.dart' show FormBuilder, AbstractControl; import 'package:test/test.dart'; Map _syncValidator(AbstractControl c) { diff --git a/test/common/forms/integration_test.dart b/test/common/forms/integration_test.dart index a1e9ee494..0e478032e 100644 --- a/test/common/forms/integration_test.dart +++ b/test/common/forms/integration_test.dart @@ -5,7 +5,7 @@ library angular2.test.common.forms.integration_test; import 'dart:async'; import 'dart:html'; -import 'package:angular2/src/common.dart'; +import 'package:angular2/common.dart'; import "package:angular2/core.dart" show Component, Directive, Output, EventEmitter; import "package:angular2/core.dart" show Provider, Input; diff --git a/test/common/forms/model_test.dart b/test/common/forms/model_test.dart index 5eef98bcf..9f6698aee 100644 --- a/test/common/forms/model_test.dart +++ b/test/common/forms/model_test.dart @@ -3,7 +3,7 @@ library angular2.test.common.forms.model_spec; import 'dart:async'; -import 'package:angular2/src/common.dart' +import 'package:angular2/common.dart' show AbstractControl, ControlGroup, Control, ControlArray, Validators; import "package:angular2/testing_internal.dart"; import 'package:test/test.dart'; diff --git a/test/common/forms/validators_test.dart b/test/common/forms/validators_test.dart index cc9e4eb1e..49030331f 100644 --- a/test/common/forms/validators_test.dart +++ b/test/common/forms/validators_test.dart @@ -3,8 +3,7 @@ library angular2.test.common.forms.validators_spec; import "dart:async"; -import 'package:angular2/src/common.dart' - show Control, Validators, AbstractControl; +import 'package:angular2/common.dart' show Control, Validators, AbstractControl; import "package:angular2/testing_internal.dart"; import 'package:test/test.dart'; diff --git a/test/core/linker/change_detection_integration_test.dart b/test/core/linker/change_detection_integration_test.dart index 649829ab7..4b75fb23c 100644 --- a/test/core/linker/change_detection_integration_test.dart +++ b/test/core/linker/change_detection_integration_test.dart @@ -5,7 +5,7 @@ import 'dart:html'; import 'package:angular2/angular2.dart'; import "package:angular2/core.dart"; -import 'package:angular2/src/common.dart' show AsyncPipe, DatePipe; +import 'package:angular2/common.dart' show AsyncPipe, DatePipe; import "package:angular2/src/core/change_detection/change_detection.dart" show PipeTransform, WrappedValue; import "package:angular2/src/core/linker/element_ref.dart" show ElementRef; diff --git a/test/core/linker/integration_test.dart b/test/core/linker/integration_test.dart index 2caf712b0..4584376e2 100644 --- a/test/core/linker/integration_test.dart +++ b/test/core/linker/integration_test.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:html'; import 'dart:js_util' as js_util; -import 'package:angular2/src/common.dart' show AsyncPipe, NgIf, NgFor; +import 'package:angular2/common.dart' show AsyncPipe, NgIf, NgFor; import 'package:angular2/core.dart' show Injector, diff --git a/test/core/linker/query_integration_test.dart b/test/core/linker/query_integration_test.dart index 25c7da19b..63bf3bc4b 100644 --- a/test/core/linker/query_integration_test.dart +++ b/test/core/linker/query_integration_test.dart @@ -1,7 +1,7 @@ @TestOn('browser && !js') library angular2.test.core.linker.query_integration_test; -import 'package:angular2/src/common.dart' show NgIf, NgFor; +import 'package:angular2/common.dart' show NgIf, NgFor; import "package:angular2/core.dart" show Component, diff --git a/test/core/linker/regression_integration_test.dart b/test/core/linker/regression_integration_test.dart index 5354ae01d..dfca381e4 100644 --- a/test/core/linker/regression_integration_test.dart +++ b/test/core/linker/regression_integration_test.dart @@ -13,7 +13,7 @@ import "package:angular2/core.dart" PLATFORM_PIPES, OpaqueToken, Injector; -import 'package:angular2/src/common.dart' show NgIf, NgClass; +import 'package:angular2/common.dart' show NgIf, NgClass; import "package:angular2/testing_internal.dart"; import 'package:test/test.dart'; diff --git a/test/core/linker/view_injector_integration_test.dart b/test/core/linker/view_injector_integration_test.dart index aef3c7070..bd2a1d088 100644 --- a/test/core/linker/view_injector_integration_test.dart +++ b/test/core/linker/view_injector_integration_test.dart @@ -2,7 +2,7 @@ library angular2.test.core.linker.view_injector_integration_test; import "package:angular2/core.dart"; -import 'package:angular2/src/common.dart'; +import 'package:angular2/common.dart'; import "package:angular2/testing_internal.dart"; import 'package:test/test.dart';