Skip to content

Commit b7542d4

Browse files
mheveryIgorMinar
mhevery
authored and
IgorMinar
committed
WIP: ts2dart fixes
1 parent d91ac6e commit b7542d4

File tree

4 files changed

+44
-25
lines changed

4 files changed

+44
-25
lines changed

‎modules/@angular/compiler/src/compiler.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,9 @@ export const COMPILER_PROVIDERS: Array<Type | Provider | any[]> = CONST_EXPR([
5959
DirectiveResolver,
6060
PipeResolver
6161
]);
62+
63+
// CONST_EXPR
64+
// /* @const */
65+
66+
// /* @Provider */ ({provide: CompilerConfig, useFactory: _createCompilerConfig, deps: []}),
67+
// const Provider(CompilerConfig, {useFactory: _createCompilerConfig, deps: []}),

‎modules/@angular/platform-browser/platform_browser.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,17 @@ export {
2828
} from './browser_common';
2929

3030
export * from './private_export';
31+
export {DOCUMENT} from './src/dom/dom_tokens';
3132

3233
import {CachedXHR} from './src/browser/xhr_cache';
3334

35+
export {
36+
bootstrapStatic,
37+
browserStaticPlatform,
38+
BROWSER_APP_PROVIDERS,
39+
BrowserPlatformLocation
40+
} from './platform_browser_static';
41+
3442
export const CACHED_TEMPLATE_PROVIDER: Array<any /*Type | Provider | any[]*/> =
3543
CONST_EXPR([new Provider(XHR, {useClass: CachedXHR})]);
3644

@@ -43,7 +51,6 @@ export const BROWSER_APP_PROVIDERS_WITH_COMPILER: Array<any /*Type | Provider |
4351
COMPILER_PROVIDERS,
4452
new Provider(XHR, {useClass: XHRImpl}),
4553
]);
46-
export {DOCUMENT} from './src/dom/dom_tokens';
4754

4855
export function browserPlatform(): PlatformRef {
4956
if (isBlank(getPlatform())) {
@@ -131,9 +138,3 @@ export function bootstrap(
131138
}
132139

133140

134-
export {
135-
bootstrapStatic,
136-
browserStaticPlatform,
137-
BROWSER_APP_PROVIDERS,
138-
BrowserPlatformLocation
139-
} from './platform_browser_static';

‎tools/broccoli/broccoli-typescript.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class DiffingTSCompiler implements DiffingBroccoliPlugin {
8383
}
8484

8585
this.tsOpts.rootDir = inputPath;
86+
this.tsOpts.baseUrl = inputPath;
8687
this.tsOpts.outDir = this.cachePath;
8788

8889
this.tsServiceHost = new CustomLanguageServiceHost(this.tsOpts, this.rootFilePaths,
@@ -339,6 +340,10 @@ class CustomLanguageServiceHost implements ts.LanguageServiceHost {
339340
return this.fileNames.map(f => path.join(this.treeInputPath, f));
340341
}
341342

343+
trace(message) {
344+
console.log('TS:', message);
345+
}
346+
342347

343348
getScriptVersion(fileName: string): string {
344349
if (startsWith(fileName, this.treeInputPath)) {

‎tools/broccoli/trees/node_tree.ts‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ module.exports = function makeNodeTree(projects, destinationPath) {
3838

3939
let externalTypings = [
4040
'@angular/typings/hammerjs/hammerjs.d.ts',
41+
'@angular/typings/jasmine/jasmine.d.ts',
4142
'@angular/typings/node/node.d.ts',
4243
'@angular/manual_typings/globals.d.ts',
4344
'@angular/typings/es6-collections/es6-collections.d.ts',
@@ -58,42 +59,42 @@ module.exports = function makeNodeTree(projects, destinationPath) {
5859
include: [
5960
'@angular/manual_typings/**',
6061
'@angular/typings/**',
61-
6262
'@angular/test/**',
63-
'benchpress/**',
64-
'**/e2e_test/**',
6563
'@angular/examples/**/*_spec.ts',
66-
6764
'@angular/src/testing/**',
6865
'@angular/testing.ts',
6966
'@angular/testing_internal.ts',
7067
'@angular/src/upgrade/**',
7168
'@angular/upgrade.ts',
7269
'@angular/platform/testing/**',
70+
71+
'benchpress/**',
72+
'**/e2e_test/**',
7373
],
7474
exclude: [
75+
'@angular/core/test/typings.d.ts',
7576
// the following code and tests are not compatible with CJS/node environment
76-
'@angular/test/animate/**',
77-
'@angular/test/core/zone/**',
78-
'@angular/test/testing/fake_async_spec.ts',
79-
'@angular/test/testing/testing_public_browser_spec.ts',
80-
'@angular/test/platform/xhr_impl_spec.ts',
81-
'@angular/test/platform/browser/**/*.ts',
82-
'@angular/test/common/forms/**',
77+
'@angular/platform-browser/test/animate/**',
78+
'@angular/core/test/zone/**',
79+
'@angular/testing/test/fake_async_spec.ts',
80+
'@angular/testing/test/testing_public_browser_spec.ts',
81+
'@angular/platform/test/xhr_impl_spec.ts',
82+
'@angular/platform/test/browser/**/*.ts',
83+
'@angular/common/test/forms/**',
8384
'@angular/manual_typings/**',
8485
'@angular/typings/**',
8586

8687
// we call browser's bootstrap
87-
'@angular/test/router/route_config/route_config_spec.ts',
88-
'@angular/test/router/integration/bootstrap_spec.ts',
88+
'@angular/router/test/route_config/route_config_spec.ts',
89+
'@angular/router/test/integration/bootstrap_spec.ts',
8990

9091
// we check the public api by importing angular2/angular2
91-
'@angular/test/symbol_inspector/**/*.ts',
92+
'@angular/symbol_inspector/test/**/*.ts',
9293
'@angular/test/public_api_spec.ts',
9394

94-
'@angular/test/web_workers/worker/renderer_integration_spec.ts',
95+
'@angular/web_workers/test/worker/renderer_integration_spec.ts',
9596

96-
'@angular/test/upgrade/**/*.ts',
97+
'@angular/upgrade/test/**/*.ts',
9798
'angular1_router/**',
9899
'payload_tests/**'
99100
]
@@ -226,12 +227,18 @@ function compileTree(tree, genInternalTypings, rootFilePaths: string[] = []) {
226227
"declaration": true,
227228
"stripInternal": true,
228229
"module": "commonjs",
229-
"moduleResolution": "classic",
230+
"moduleResolution": "node",
230231
"noEmitOnError": true,
231232
"rootDir": ".",
232233
"inlineSourceMap": true,
233234
"inlineSources": true,
234-
"target": "es5"
235+
"target": "es5",
236+
// "traceResolution": true,
237+
"baseUrl": ".",
238+
"paths": {
239+
"rxjs/*": ["./rxjs/*"],
240+
"@angular/*": ["./@angular/*"]
241+
}
235242
});
236243
}
237244

0 commit comments

Comments
 (0)