From 3466232f8bf653bd47369af3d7228ddcc212864f Mon Sep 17 00:00:00 2001 From: vikerman Date: Thu, 11 Aug 2016 19:37:01 -0700 Subject: [PATCH] fix(build): Remove duplicate System declarations (#10713) Add it to a common .d.ts. Prevents closure from complaining of duplicate declarations when compiled using tsickle to generate externs. --- .../core/src/linker/system_js_ng_module_factory_loader.ts | 2 -- .../@angular/core/src/linker/systemjs_component_resolver.ts | 2 -- modules/@angular/core/tsconfig-es2015.json | 3 ++- modules/@angular/core/tsconfig-es5.json | 3 ++- modules/playground/src/bootstrap.ts | 2 -- modules/system.d.ts | 4 ++++ modules/types.d.ts | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 modules/system.d.ts diff --git a/modules/@angular/core/src/linker/system_js_ng_module_factory_loader.ts b/modules/@angular/core/src/linker/system_js_ng_module_factory_loader.ts index 7674671cdd..1cc94f1588 100644 --- a/modules/@angular/core/src/linker/system_js_ng_module_factory_loader.ts +++ b/modules/@angular/core/src/linker/system_js_ng_module_factory_loader.ts @@ -13,8 +13,6 @@ import {Compiler} from './compiler'; import {NgModuleFactory} from './ng_module_factory'; import {NgModuleFactoryLoader} from './ng_module_factory_loader'; -declare var System: {import: (module: string) => Promise;}; - const _SEPARATOR = '#'; const FACTORY_MODULE_SUFFIX = '.ngfactory'; diff --git a/modules/@angular/core/src/linker/systemjs_component_resolver.ts b/modules/@angular/core/src/linker/systemjs_component_resolver.ts index 3736800251..e470e5a37f 100644 --- a/modules/@angular/core/src/linker/systemjs_component_resolver.ts +++ b/modules/@angular/core/src/linker/systemjs_component_resolver.ts @@ -13,8 +13,6 @@ import {Type} from '../type'; import {ComponentFactory} from './component_factory'; import {ComponentResolver} from './component_resolver'; -declare var System: {import: (module: string) => Promise;}; - const _SEPARATOR = '#'; /** diff --git a/modules/@angular/core/tsconfig-es2015.json b/modules/@angular/core/tsconfig-es2015.json index 72c42414af..27bb922c15 100644 --- a/modules/@angular/core/tsconfig-es2015.json +++ b/modules/@angular/core/tsconfig-es2015.json @@ -18,6 +18,7 @@ "files": [ "index.ts", "testing.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../../node_modules/zone.js/dist/zone.js.d.ts", + "../../system.d.ts" ] } diff --git a/modules/@angular/core/tsconfig-es5.json b/modules/@angular/core/tsconfig-es5.json index 4edc062bfa..c19294c60a 100644 --- a/modules/@angular/core/tsconfig-es5.json +++ b/modules/@angular/core/tsconfig-es5.json @@ -19,6 +19,7 @@ "files": [ "index.ts", "testing.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" + "../../../node_modules/zone.js/dist/zone.js.d.ts", + "../../system.d.ts" ] } diff --git a/modules/playground/src/bootstrap.ts b/modules/playground/src/bootstrap.ts index bd99673389..0f05070039 100644 --- a/modules/playground/src/bootstrap.ts +++ b/modules/playground/src/bootstrap.ts @@ -6,8 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -declare var System: any; - (function(global: any /** TODO #9100 */) { diff --git a/modules/system.d.ts b/modules/system.d.ts new file mode 100644 index 0000000000..f94cec235e --- /dev/null +++ b/modules/system.d.ts @@ -0,0 +1,4 @@ +/** + * Dummy typings for systemjs. + */ +declare var System: any; diff --git a/modules/types.d.ts b/modules/types.d.ts index 58dd2c2eb0..b15312fbcb 100644 --- a/modules/types.d.ts +++ b/modules/types.d.ts @@ -15,3 +15,4 @@ /// /// /// +///