From f34f8df3194428179398fab82ff68684c82178b3 Mon Sep 17 00:00:00 2001 From: Jeff Cross Date: Tue, 9 Jun 2015 10:21:25 -0700 Subject: [PATCH] refactor(xhr): move render's xhr implementation to render/ The existence of this module in the services/ folder led some to believe xhr is meant to be a general-purpose http library. Fixes #2305 --- modules/angular2/src/core/application.ts | 4 ++-- modules/angular2/src/render/dom/compiler/template_loader.ts | 2 +- modules/angular2/src/render/dom/shadow_dom/style_inliner.ts | 2 +- modules/angular2/src/{services => render}/xhr.ts | 0 modules/angular2/src/{services => render}/xhr_impl.dart | 0 modules/angular2/src/{services => render}/xhr_impl.ts | 0 modules/angular2/src/{mock => render}/xhr_mock.ts | 2 +- modules/angular2/src/test_lib/test_injector.ts | 4 ++-- modules/angular2/src/transform/common/xhr_impl.dart | 2 +- .../angular2/src/transform/directive_processor/rewriter.dart | 2 +- .../angular2/src/transform/directive_processor/visitors.dart | 2 +- .../angular2/src/transform/template_compiler/generator.dart | 2 +- .../angular2/test/render/dom/compiler/template_loader_spec.ts | 2 +- .../shadow_dom/emulated_scoped_shadow_dom_strategy_spec.ts | 2 +- .../angular2/test/render/dom/shadow_dom/style_inliner_spec.ts | 2 +- modules/angular2/test/{services => render}/xhr_impl_spec.ts | 2 +- modules/angular2/test/{mock => render}/xhr_mock_spec.ts | 2 +- tools/broccoli/trees/node_tree.ts | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename modules/angular2/src/{services => render}/xhr.ts (100%) rename modules/angular2/src/{services => render}/xhr_impl.dart (100%) rename modules/angular2/src/{services => render}/xhr_impl.ts (100%) rename modules/angular2/src/{mock => render}/xhr_mock.ts (98%) rename modules/angular2/test/{services => render}/xhr_impl_spec.ts (94%) rename modules/angular2/test/{mock => render}/xhr_mock_spec.ts (98%) diff --git a/modules/angular2/src/core/application.ts b/modules/angular2/src/core/application.ts index 87536509fb..70b5ecfb7f 100644 --- a/modules/angular2/src/core/application.ts +++ b/modules/angular2/src/core/application.ts @@ -33,8 +33,8 @@ import {ShadowDomStrategy} from 'angular2/src/render/dom/shadow_dom/shadow_dom_s import { EmulatedUnscopedShadowDomStrategy } from 'angular2/src/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy'; -import {XHR} from 'angular2/src/services/xhr'; -import {XHRImpl} from 'angular2/src/services/xhr_impl'; +import {XHR} from 'angular2/src/render/xhr'; +import {XHRImpl} from 'angular2/src/render/xhr_impl'; import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events'; import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestures'; diff --git a/modules/angular2/src/render/dom/compiler/template_loader.ts b/modules/angular2/src/render/dom/compiler/template_loader.ts index 4ebfe2cd7e..31b4c48c86 100644 --- a/modules/angular2/src/render/dom/compiler/template_loader.ts +++ b/modules/angular2/src/render/dom/compiler/template_loader.ts @@ -4,7 +4,7 @@ import {Map, MapWrapper, StringMapWrapper, StringMap} from 'angular2/src/facade/ import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {DOM} from 'angular2/src/dom/dom_adapter'; -import {XHR} from 'angular2/src/services/xhr'; +import {XHR} from 'angular2/src/render/xhr'; import {ViewDefinition} from '../../api'; import {UrlResolver} from 'angular2/src/services/url_resolver'; diff --git a/modules/angular2/src/render/dom/shadow_dom/style_inliner.ts b/modules/angular2/src/render/dom/shadow_dom/style_inliner.ts index fdf0b16193..59d3fab417 100644 --- a/modules/angular2/src/render/dom/shadow_dom/style_inliner.ts +++ b/modules/angular2/src/render/dom/shadow_dom/style_inliner.ts @@ -1,5 +1,5 @@ import {Injectable} from 'angular2/di'; -import {XHR} from 'angular2/src/services/xhr'; +import {XHR} from 'angular2/src/render/xhr'; import {ListWrapper} from 'angular2/src/facade/collection'; import {UrlResolver} from 'angular2/src/services/url_resolver'; diff --git a/modules/angular2/src/services/xhr.ts b/modules/angular2/src/render/xhr.ts similarity index 100% rename from modules/angular2/src/services/xhr.ts rename to modules/angular2/src/render/xhr.ts diff --git a/modules/angular2/src/services/xhr_impl.dart b/modules/angular2/src/render/xhr_impl.dart similarity index 100% rename from modules/angular2/src/services/xhr_impl.dart rename to modules/angular2/src/render/xhr_impl.dart diff --git a/modules/angular2/src/services/xhr_impl.ts b/modules/angular2/src/render/xhr_impl.ts similarity index 100% rename from modules/angular2/src/services/xhr_impl.ts rename to modules/angular2/src/render/xhr_impl.ts diff --git a/modules/angular2/src/mock/xhr_mock.ts b/modules/angular2/src/render/xhr_mock.ts similarity index 98% rename from modules/angular2/src/mock/xhr_mock.ts rename to modules/angular2/src/render/xhr_mock.ts index 4eea76363f..88bac08085 100644 --- a/modules/angular2/src/mock/xhr_mock.ts +++ b/modules/angular2/src/render/xhr_mock.ts @@ -1,4 +1,4 @@ -import {XHR} from 'angular2/src/services/xhr'; +import {XHR} from 'angular2/src/render/xhr'; import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {isBlank, isPresent, normalizeBlank, BaseException} from 'angular2/src/facade/lang'; import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; diff --git a/modules/angular2/src/test_lib/test_injector.ts b/modules/angular2/src/test_lib/test_injector.ts index e66bfe25dd..3217122b61 100644 --- a/modules/angular2/src/test_lib/test_injector.ts +++ b/modules/angular2/src/test_lib/test_injector.ts @@ -19,7 +19,7 @@ import {ShadowDomStrategy} from 'angular2/src/render/dom/shadow_dom/shadow_dom_s import { EmulatedUnscopedShadowDomStrategy } from 'angular2/src/render/dom/shadow_dom/emulated_unscoped_shadow_dom_strategy'; -import {XHR} from 'angular2/src/services/xhr'; +import {XHR} from 'angular2/src/render/xhr'; import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper'; import {UrlResolver} from 'angular2/src/services/url_resolver'; import {StyleUrlResolver} from 'angular2/src/render/dom/shadow_dom/style_url_resolver'; @@ -31,7 +31,7 @@ import {DOM} from 'angular2/src/dom/dom_adapter'; import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager'; import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock'; -import {MockXHR} from 'angular2/src/mock/xhr_mock'; +import {MockXHR} from 'angular2/src/render/xhr_mock'; import {MockNgZone} from 'angular2/src/mock/ng_zone_mock'; import {TestBed} from './test_bed'; diff --git a/modules/angular2/src/transform/common/xhr_impl.dart b/modules/angular2/src/transform/common/xhr_impl.dart index 055f04329f..5d53d1014c 100644 --- a/modules/angular2/src/transform/common/xhr_impl.dart +++ b/modules/angular2/src/transform/common/xhr_impl.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.xhr_impl; import 'dart:async'; -import 'package:angular2/src/services/xhr.dart' show XHR; +import 'package:angular2/src/render/xhr.dart' show XHR; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/logging.dart'; import 'package:barback/barback.dart'; diff --git a/modules/angular2/src/transform/directive_processor/rewriter.dart b/modules/angular2/src/transform/directive_processor/rewriter.dart index 990175be00..88ece1c4da 100644 --- a/modules/angular2/src/transform/directive_processor/rewriter.dart +++ b/modules/angular2/src/transform/directive_processor/rewriter.dart @@ -3,7 +3,7 @@ library angular2.transform.directive_processor.rewriter; import 'dart:async'; import 'package:analyzer/analyzer.dart'; -import 'package:angular2/src/services/xhr.dart' show XHR; +import 'package:angular2/src/render/xhr.dart' show XHR; import 'package:angular2/src/transform/common/annotation_matcher.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/transform/common/async_string_writer.dart'; diff --git a/modules/angular2/src/transform/directive_processor/visitors.dart b/modules/angular2/src/transform/directive_processor/visitors.dart index 6719e448b5..ea1298ab68 100644 --- a/modules/angular2/src/transform/directive_processor/visitors.dart +++ b/modules/angular2/src/transform/directive_processor/visitors.dart @@ -2,7 +2,7 @@ library angular2.transform.directive_processor.visitors; import 'package:analyzer/analyzer.dart'; import 'package:analyzer/src/generated/java_core.dart'; -import 'package:angular2/src/services/xhr.dart' show XHR; +import 'package:angular2/src/render/xhr.dart' show XHR; import 'package:angular2/src/transform/common/async_string_writer.dart'; import 'package:angular2/src/transform/common/logging.dart'; diff --git a/modules/angular2/src/transform/template_compiler/generator.dart b/modules/angular2/src/transform/template_compiler/generator.dart index 319bcd2acc..1fa3c78e16 100644 --- a/modules/angular2/src/transform/template_compiler/generator.dart +++ b/modules/angular2/src/transform/template_compiler/generator.dart @@ -9,7 +9,7 @@ import 'package:angular2/src/render/api.dart'; import 'package:angular2/src/render/dom/compiler/compile_pipeline.dart'; import 'package:angular2/src/render/dom/compiler/template_loader.dart'; import 'package:angular2/src/render/dom/view/property_setter_factory.dart'; -import 'package:angular2/src/services/xhr.dart' show XHR; +import 'package:angular2/src/render/xhr.dart' show XHR; import 'package:angular2/src/reflection/reflection.dart'; import 'package:angular2/src/services/url_resolver.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; diff --git a/modules/angular2/test/render/dom/compiler/template_loader_spec.ts b/modules/angular2/test/render/dom/compiler/template_loader_spec.ts index ec4c668999..316a74a06f 100644 --- a/modules/angular2/test/render/dom/compiler/template_loader_spec.ts +++ b/modules/angular2/test/render/dom/compiler/template_loader_spec.ts @@ -16,7 +16,7 @@ import {UrlResolver} from 'angular2/src/services/url_resolver'; import {ViewDefinition} from 'angular2/src/render/api'; import {PromiseWrapper} from 'angular2/src/facade/async'; -import {MockXHR} from 'angular2/src/mock/xhr_mock'; +import {MockXHR} from 'angular2/src/render/xhr_mock'; export function main() { describe('TemplateLoader', () => { diff --git a/modules/angular2/test/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy_spec.ts b/modules/angular2/test/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy_spec.ts index 9981308e8a..6cbcdcdabf 100644 --- a/modules/angular2/test/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy_spec.ts +++ b/modules/angular2/test/render/dom/shadow_dom/emulated_scoped_shadow_dom_strategy_spec.ts @@ -18,7 +18,7 @@ import {DOM} from 'angular2/src/dom/dom_adapter'; import {Map, MapWrapper} from 'angular2/src/facade/collection'; import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; -import {XHR} from 'angular2/src/services/xhr'; +import {XHR} from 'angular2/src/render/xhr'; import { EmulatedScopedShadowDomStrategy, diff --git a/modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.ts b/modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.ts index 84cdc9b26a..4f41b83cb8 100644 --- a/modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.ts +++ b/modules/angular2/test/render/dom/shadow_dom/style_inliner_spec.ts @@ -17,7 +17,7 @@ import {isBlank} from 'angular2/src/facade/lang'; import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Map, MapWrapper} from 'angular2/src/facade/collection'; -import {XHR} from 'angular2/src/services/xhr'; +import {XHR} from 'angular2/src/render/xhr'; import {bind} from 'angular2/di'; diff --git a/modules/angular2/test/services/xhr_impl_spec.ts b/modules/angular2/test/render/xhr_impl_spec.ts similarity index 94% rename from modules/angular2/test/services/xhr_impl_spec.ts rename to modules/angular2/test/render/xhr_impl_spec.ts index a7908afdf5..ca5be24ee5 100644 --- a/modules/angular2/test/services/xhr_impl_spec.ts +++ b/modules/angular2/test/render/xhr_impl_spec.ts @@ -10,7 +10,7 @@ import { xit } from 'angular2/test_lib'; -import {XHRImpl} from 'angular2/src/services/xhr_impl'; +import {XHRImpl} from 'angular2/src/render/xhr_impl'; import {PromiseWrapper} from 'angular2/src/facade/async'; export function main() { diff --git a/modules/angular2/test/mock/xhr_mock_spec.ts b/modules/angular2/test/render/xhr_mock_spec.ts similarity index 98% rename from modules/angular2/test/mock/xhr_mock_spec.ts rename to modules/angular2/test/render/xhr_mock_spec.ts index 20564897f5..0df9e151e9 100644 --- a/modules/angular2/test/mock/xhr_mock_spec.ts +++ b/modules/angular2/test/render/xhr_mock_spec.ts @@ -10,7 +10,7 @@ import { IS_DARTIUM, it, } from 'angular2/test_lib'; -import {MockXHR} from 'angular2/src/mock/xhr_mock'; +import {MockXHR} from 'angular2/src/render/xhr_mock'; import {PromiseWrapper, Promise} from 'angular2/src/facade/async'; import {isPresent} from 'angular2/src/facade/lang'; diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index c9e67095d3..13fa8449a1 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -23,7 +23,7 @@ module.exports = function makeNodeTree(destinationPath) { // the following code and tests are not compatible with CJS/node environment 'angular2/test/core/zone/**', 'angular2/test/test_lib/fake_async_spec.ts', - 'angular2/test/services/xhr_impl_spec.ts', + 'angular2/test/render/xhr_impl_spec.ts', 'angular2/test/forms/**' ] });