Skip to content

Commit e8e57cd

Browse files
tboschtbosch
committed
refactor(core): adjust imports for rename angular2/src/compiler -> angular2/src/core/compiler
1 parent aa3d941 commit e8e57cd

33 files changed

Lines changed: 112 additions & 96 deletions

‎modules/angular2/src/core/application.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:angular2/src/core/reflection/reflection_capabilities.dart'
77
show ReflectionCapabilities;
88
import 'application_common.dart';
99

10-
import 'package:angular2/src/compiler/compiler.dart';
10+
import 'package:angular2/src/core/compiler/compiler.dart';
1111
import 'package:angular2/src/core/linker/dynamic_component_loader.dart';
1212
export 'package:angular2/src/core/linker/dynamic_component_loader.dart' show ComponentRef;
1313

‎modules/angular2/src/core/application.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import {Binding} from './di';
33
import {Type, isPresent} from 'angular2/src/core/facade/lang';
44
import {Promise} from 'angular2/src/core/facade/async';
5-
import {compilerBindings} from 'angular2/src/compiler/compiler';
5+
import {compilerBindings} from 'angular2/src/core/compiler/compiler';
66
import {commonBootstrap} from './application_common';
77
import {ComponentRef} from './linker/dynamic_component_loader';
88

‎modules/angular2/src/core/compiler/compiler.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ export {SourceModule, SourceWithImports} from './source_module';
88

99
import {assertionsEnabled, Type} from 'angular2/src/core/facade/lang';
1010
import {bind, Binding} from 'angular2/src/core/di';
11-
import {TemplateParser} from 'angular2/src/compiler/template_parser';
12-
import {HtmlParser} from 'angular2/src/compiler/html_parser';
13-
import {TemplateNormalizer} from 'angular2/src/compiler/template_normalizer';
14-
import {RuntimeMetadataResolver} from 'angular2/src/compiler/runtime_metadata';
15-
import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler';
16-
import {StyleCompiler} from 'angular2/src/compiler/style_compiler';
17-
import {CommandCompiler} from 'angular2/src/compiler/command_compiler';
18-
import {TemplateCompiler} from 'angular2/src/compiler/template_compiler';
11+
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
12+
import {HtmlParser} from 'angular2/src/core/compiler/html_parser';
13+
import {TemplateNormalizer} from 'angular2/src/core/compiler/template_normalizer';
14+
import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata';
15+
import {ChangeDetectionCompiler} from 'angular2/src/core/compiler/change_detector_compiler';
16+
import {StyleCompiler} from 'angular2/src/core/compiler/style_compiler';
17+
import {CommandCompiler} from 'angular2/src/core/compiler/command_compiler';
18+
import {TemplateCompiler} from 'angular2/src/core/compiler/template_compiler';
1919
import {ChangeDetectorGenConfig} from 'angular2/src/core/change_detection/change_detection';
2020
import {Compiler} from 'angular2/src/core/linker/compiler';
21-
import {RuntimeCompiler} from 'angular2/src/compiler/runtime_compiler';
21+
import {RuntimeCompiler} from 'angular2/src/core/compiler/runtime_compiler';
2222
import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
2323
import {
2424
DomElementSchemaRegistry

‎modules/angular2/src/test_lib/test_injector.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import {
6565
} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
6666
import {Serializer} from "angular2/src/web_workers/shared/serializer";
6767
import {Log} from './utils';
68-
import {compilerBindings} from 'angular2/src/compiler/compiler';
68+
import {compilerBindings} from 'angular2/src/core/compiler/compiler';
6969

7070
/**
7171
* Returns the root injector bindings.

‎modules/angular2/src/transform/template_compiler/change_detector_codegen.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import {
44

55
// Note: This class is only here so that we can reference it from TypeScript code.
66
// The actual implementation lives under modules_dart.
7-
// TODO(tbosch): Move the corresponding code into angular2/src/compiler once
7+
// TODO(tbosch): Move the corresponding code into angular2/src/core/compiler once
88
// the new compiler is done.
99
export class Codegen {
1010
constructor(moduleAlias: string) {}
1111
generate(typeName: string, changeDetectorTypeName: string, def: ChangeDetectorDefinition): void {
1212
throw "Not implemented in JS";
1313
}
1414
toString(): string { throw "Not implemented in JS"; }
15-
}
15+
}

‎modules/angular2/src/web_workers/worker/application_common.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
3535
import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher';
3636
import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader';
3737
import {NgZone} from 'angular2/src/core/zone/ng_zone';
38-
import {compilerBindings} from 'angular2/src/compiler/compiler';
38+
import {compilerBindings} from 'angular2/src/core/compiler/compiler';
3939

4040
/**
4141
* Initialize the Angular 'platform' on the page in a manner suitable for applications

‎modules/angular2/test/core/compiler/change_definition_factory_spec.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {MapWrapper} from 'angular2/src/core/facade/collection';
1616
import {
1717
CompileDirectiveMetadata,
1818
CompileTypeMetadata
19-
} from 'angular2/src/compiler/directive_metadata';
20-
import {TemplateParser} from 'angular2/src/compiler/template_parser';
19+
} from 'angular2/src/core/compiler/directive_metadata';
20+
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
2121
import {
2222
Parser,
2323
Lexer,
@@ -32,7 +32,9 @@ import {
3232
ChangeDetector
3333
} from 'angular2/src/core/change_detection/change_detection';
3434
import {Pipes} from 'angular2/src/core/change_detection/pipes';
35-
import {createChangeDetectorDefinitions} from 'angular2/src/compiler/change_definition_factory';
35+
import {
36+
createChangeDetectorDefinitions
37+
} from 'angular2/src/core/compiler/change_definition_factory';
3638
import {TestDirective, TestDispatcher, TestPipes} from './change_detector_mocks';
3739

3840
import {TEST_BINDINGS} from './test_bindings';

‎modules/angular2/test/core/compiler/change_detector_compiler_spec.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ import {CONST_EXPR, stringify} from 'angular2/src/core/facade/lang';
1818
import {MapWrapper} from 'angular2/src/core/facade/collection';
1919
import {Promise} from 'angular2/src/core/facade/async';
2020

21-
import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler';
21+
import {ChangeDetectionCompiler} from 'angular2/src/core/compiler/change_detector_compiler';
2222

2323
import {
2424
CompileDirectiveMetadata,
2525
CompileTypeMetadata
26-
} from 'angular2/src/compiler/directive_metadata';
26+
} from 'angular2/src/core/compiler/directive_metadata';
2727
import {
2828
SourceModule,
2929
SourceExpression,
3030
SourceExpressions,
3131
moduleRef
32-
} from 'angular2/src/compiler/source_module';
32+
} from 'angular2/src/core/compiler/source_module';
3333

34-
import {TemplateParser} from 'angular2/src/compiler/template_parser';
34+
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
3535

3636
import {
3737
ChangeDetectorGenConfig,
@@ -47,10 +47,14 @@ import {evalModule} from './eval_module';
4747

4848
import {TEST_BINDINGS} from './test_bindings';
4949
import {TestDispatcher, TestPipes} from './change_detector_mocks';
50-
import {codeGenValueFn, codeGenExportVariable, MODULE_SUFFIX} from 'angular2/src/compiler/util';
50+
import {
51+
codeGenValueFn,
52+
codeGenExportVariable,
53+
MODULE_SUFFIX
54+
} from 'angular2/src/core/compiler/util';
5155

5256
// Attention: These module names have to correspond to real modules!
53-
var THIS_MODULE_ID = 'angular2/test/compiler/change_detector_compiler_spec';
57+
var THIS_MODULE_ID = 'angular2/test/core/compiler/change_detector_compiler_spec';
5458
var THIS_MODULE_URL = `package:${THIS_MODULE_ID}${MODULE_SUFFIX}`;
5559
var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL);
5660

@@ -151,4 +155,4 @@ export function testChangeDetector(changeDetectorFactory: Function): string[] {
151155

152156
class SomeComponent {
153157
someProp: string;
154-
}
158+
}

‎modules/angular2/test/core/compiler/command_compiler_spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import {CONST_EXPR, stringify, isType, Type, isBlank} from 'angular2/src/core/facade/lang';
1717
import {MapWrapper} from 'angular2/src/core/facade/collection';
1818
import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
19-
import {TemplateParser} from 'angular2/src/compiler/template_parser';
19+
import {TemplateParser} from 'angular2/src/core/compiler/template_parser';
2020
import {
2121
CommandVisitor,
2222
TextCmd,
@@ -28,21 +28,21 @@ import {
2828
visitAllCommands,
2929
CompiledTemplate
3030
} from 'angular2/src/core/linker/template_commands';
31-
import {CommandCompiler} from 'angular2/src/compiler/command_compiler';
31+
import {CommandCompiler} from 'angular2/src/core/compiler/command_compiler';
3232
import {
3333
CompileDirectiveMetadata,
3434
CompileTypeMetadata,
3535
CompileTemplateMetadata
36-
} from 'angular2/src/compiler/directive_metadata';
37-
import {SourceModule, SourceExpression, moduleRef} from 'angular2/src/compiler/source_module';
36+
} from 'angular2/src/core/compiler/directive_metadata';
37+
import {SourceModule, SourceExpression, moduleRef} from 'angular2/src/core/compiler/source_module';
3838
import {ViewEncapsulation} from 'angular2/src/core/render/api';
3939
import {evalModule} from './eval_module';
4040
import {
4141
escapeSingleQuoteString,
4242
codeGenValueFn,
4343
codeGenExportVariable,
4444
MODULE_SUFFIX
45-
} from 'angular2/src/compiler/util';
45+
} from 'angular2/src/core/compiler/util';
4646
import {TEST_BINDINGS} from './test_bindings';
4747

4848
const BEGIN_ELEMENT = 'BEGIN_ELEMENT';
@@ -54,7 +54,7 @@ const NG_CONTENT = 'NG_CONTENT';
5454
const EMBEDDED_TEMPLATE = 'EMBEDDED_TEMPLATE';
5555

5656
// Attention: These module names have to correspond to real modules!
57-
var THIS_MODULE_URL = `package:angular2/test/compiler/command_compiler_spec${MODULE_SUFFIX}`;
57+
var THIS_MODULE_URL = `package:angular2/test/core/compiler/command_compiler_spec${MODULE_SUFFIX}`;
5858
var THIS_MODULE_REF = moduleRef(THIS_MODULE_URL);
5959
var TEMPLATE_COMMANDS_MODULE_REF =
6060
moduleRef(`package:angular2/src/core/linker/template_commands${MODULE_SUFFIX}`);

‎modules/angular2/test/core/compiler/directive_metadata_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
CompileDirectiveMetadata,
1717
CompileTypeMetadata,
1818
CompileTemplateMetadata
19-
} from 'angular2/src/compiler/directive_metadata';
19+
} from 'angular2/src/core/compiler/directive_metadata';
2020
import {ViewEncapsulation} from 'angular2/src/core/render/api';
2121
import {ChangeDetectionStrategy} from 'angular2/src/core/change_detection';
2222
import {LifecycleHooks} from 'angular2/src/core/linker/interfaces';

0 commit comments

Comments
 (0)