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.
This commit is contained in:
vikerman 2016-08-11 19:37:01 -07:00 committed by GitHub
parent 6e842fc5bf
commit 3466232f8b
7 changed files with 9 additions and 8 deletions

View File

@ -13,8 +13,6 @@ import {Compiler} from './compiler';
import {NgModuleFactory} from './ng_module_factory'; import {NgModuleFactory} from './ng_module_factory';
import {NgModuleFactoryLoader} from './ng_module_factory_loader'; import {NgModuleFactoryLoader} from './ng_module_factory_loader';
declare var System: {import: (module: string) => Promise<any>;};
const _SEPARATOR = '#'; const _SEPARATOR = '#';
const FACTORY_MODULE_SUFFIX = '.ngfactory'; const FACTORY_MODULE_SUFFIX = '.ngfactory';

View File

@ -13,8 +13,6 @@ import {Type} from '../type';
import {ComponentFactory} from './component_factory'; import {ComponentFactory} from './component_factory';
import {ComponentResolver} from './component_resolver'; import {ComponentResolver} from './component_resolver';
declare var System: {import: (module: string) => Promise<any>;};
const _SEPARATOR = '#'; const _SEPARATOR = '#';
/** /**

View File

@ -18,6 +18,7 @@
"files": [ "files": [
"index.ts", "index.ts",
"testing.ts", "testing.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts" "../../../node_modules/zone.js/dist/zone.js.d.ts",
"../../system.d.ts"
] ]
} }

View File

@ -19,6 +19,7 @@
"files": [ "files": [
"index.ts", "index.ts",
"testing.ts", "testing.ts",
"../../../node_modules/zone.js/dist/zone.js.d.ts" "../../../node_modules/zone.js/dist/zone.js.d.ts",
"../../system.d.ts"
] ]
} }

View File

@ -6,8 +6,6 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
declare var System: any;
(function(global: any /** TODO #9100 */) { (function(global: any /** TODO #9100 */) {

4
modules/system.d.ts vendored Normal file
View File

@ -0,0 +1,4 @@
/**
* Dummy typings for systemjs.
*/
declare var System: any;

1
modules/types.d.ts vendored
View File

@ -15,3 +15,4 @@
/// <reference path="../node_modules/@types/protractor/index.d.ts" /> /// <reference path="../node_modules/@types/protractor/index.d.ts" />
/// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" /> /// <reference path="../node_modules/@types/selenium-webdriver/index.d.ts" />
/// <reference path="./es6-subset.d.ts" /> /// <reference path="./es6-subset.d.ts" />
/// <reference path="./system.d.ts" />