From dd6cb233b55d7a54ce9f27f6b6b7a31103d4a5be Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Fri, 27 May 2016 12:36:24 -0700 Subject: [PATCH] build: add missing testing.ts entry points to tsconfigs --- .../@angular/platform-browser/private_export.ts | 11 +++++++++++ .../@angular/platform-browser/tsconfig-es2015.json | 6 +++++- .../@angular/platform-browser/tsconfig-es5.json | 6 +++++- .../platform-server/platform_browser_private.ts | 8 ++++++++ modules/@angular/platform-server/testing/server.ts | 8 +++----- .../@angular/platform-server/tsconfig-es2015.json | 8 +++++++- modules/@angular/platform-server/tsconfig-es5.json | 14 ++++++++++---- 7 files changed, 49 insertions(+), 12 deletions(-) diff --git a/modules/@angular/platform-browser/private_export.ts b/modules/@angular/platform-browser/private_export.ts index 2b1dbe40cb..a1affa190d 100644 --- a/modules/@angular/platform-browser/private_export.ts +++ b/modules/@angular/platform-browser/private_export.ts @@ -1,4 +1,6 @@ import * as dom_adapter from './src/dom/dom_adapter'; +import * as dom_renderer from './src/dom/dom_renderer'; +import * as shared_styles_host from './src/dom/shared_styles_host'; export namespace __platform_browser_private__ { export type DomAdapter = dom_adapter.DomAdapter; @@ -7,4 +9,13 @@ export namespace __platform_browser_private__ { export function getDOM(): DomAdapter { return dom_adapter.getDOM(); } export var setRootDomAdapter = dom_adapter.setRootDomAdapter; + + export type DomRootRenderer = dom_renderer.DomRootRenderer; + export var DomRootRenderer = dom_renderer.DomRootRenderer; + export type DomRootRenderer_ = dom_renderer.DomRootRenderer_; + export var DomRootRenderer_ = dom_renderer.DomRootRenderer_; + export type DomSharedStylesHost = shared_styles_host.DomSharedStylesHost; + export var DomSharedStylesHost = shared_styles_host.DomSharedStylesHost; + export type SharedStylesHost = shared_styles_host.SharedStylesHost; + export var SharedStylesHost = shared_styles_host.SharedStylesHost; } diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json index febd2300de..e624c1e05f 100644 --- a/modules/@angular/platform-browser/tsconfig-es2015.json +++ b/modules/@angular/platform-browser/tsconfig-es2015.json @@ -17,7 +17,10 @@ "@angular/common": ["../../../dist/packages-dist/common"], "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"] + "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], + // workaround for https://github.com/Microsoft/TypeScript/issues/8723 + // we can get rid of this once we update to typescript 1.9.0-dev.20160525-1.0 or newer + "selenium-webdriver": ["../../../node_modules/@types/selenium-webdriver/index.d.ts"] }, "rootDir": ".", "sourceMap": true, @@ -27,6 +30,7 @@ "files": [ "index.ts", "testing.ts", + "testing_e2e.ts", "../../../node_modules/@types/hammerjs/index.d.ts", "../../../node_modules/@types/protractor/index.d.ts", "../../../node_modules/@types/jasmine/index.d.ts", diff --git a/modules/@angular/platform-browser/tsconfig-es5.json b/modules/@angular/platform-browser/tsconfig-es5.json index 8160dcab37..f7071c646e 100644 --- a/modules/@angular/platform-browser/tsconfig-es5.json +++ b/modules/@angular/platform-browser/tsconfig-es5.json @@ -17,7 +17,10 @@ "@angular/common": ["../../../dist/packages-dist/common"], "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"] + "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], + // workaround for https://github.com/Microsoft/TypeScript/issues/8723 + // we can get rid of this once we update to typescript 1.9.0-dev.20160525-1.0 or newer + "selenium-webdriver": ["../../../node_modules/@types/selenium-webdriver/index.d.ts"] }, "rootDir": ".", "sourceMap": true, @@ -28,6 +31,7 @@ "files": [ "index.ts", "testing.ts", + "testing_e2e.ts", "../../../node_modules/@types/hammerjs/index.d.ts", "../../../node_modules/@types/protractor/index.d.ts", "../../../node_modules/@types/jasmine/index.d.ts", diff --git a/modules/@angular/platform-server/platform_browser_private.ts b/modules/@angular/platform-server/platform_browser_private.ts index c441694ccb..0a030949e9 100644 --- a/modules/@angular/platform-server/platform_browser_private.ts +++ b/modules/@angular/platform-server/platform_browser_private.ts @@ -4,3 +4,11 @@ export type DomAdapter = typeof _.DomAdapter; export var DomAdapter: typeof _.DomAdapter = _.DomAdapter; export var setRootDomAdapter: typeof _.setRootDomAdapter = _.setRootDomAdapter; export var getDOM: typeof _.getDOM = _.getDOM; +export type DomRootRenderer = typeof _.DomRootRenderer; +export var DomRootRenderer: typeof _.DomRootRenderer = _.DomRootRenderer; +export type DomRootRenderer_ = typeof _.DomRootRenderer_; +export var DomRootRenderer_: typeof _.DomRootRenderer_ = _.DomRootRenderer_; +export type DomSharedStylesHost = typeof _.DomSharedStylesHost; +export var DomSharedStylesHost: typeof _.DomSharedStylesHost = _.DomSharedStylesHost; +export type SharedStylesHost = typeof _.SharedStylesHost; +export var SharedStylesHost: typeof _.SharedStylesHost = _.SharedStylesHost; diff --git a/modules/@angular/platform-server/testing/server.ts b/modules/@angular/platform-server/testing/server.ts index d21ffa3898..1ed2987449 100644 --- a/modules/@angular/platform-server/testing/server.ts +++ b/modules/@angular/platform-server/testing/server.ts @@ -14,7 +14,7 @@ import { TestComponentRenderer } from '@angular/compiler/testing'; import {Parse5DomAdapter} from '../index'; -import {MockLocationStrategy} from '../../common/testing/mock_location_strategy'; +import {MockLocationStrategy} from '@angular/common/testing'; import {BrowserDetection, DOMTestComponentRenderer} from '@angular/platform-browser/testing'; import {AnimationDriver, NoOpAnimationDriver} from '../core_private'; import { @@ -23,11 +23,9 @@ import { EventManager, EVENT_MANAGER_PLUGINS, ELEMENT_PROBE_PROVIDERS, - DomEventsPlugin + DomEventsPlugin, } from '@angular/platform-browser'; -import {getDOM} from '../platform_browser_private'; -import {DomRootRenderer, DomRootRenderer_} from '../../platform-browser/src/dom/dom_renderer'; -import {DomSharedStylesHost, SharedStylesHost} from '../../platform-browser/src/dom/shared_styles_host'; +import {getDOM, DomRootRenderer, DomRootRenderer_, DomSharedStylesHost, SharedStylesHost} from '../platform_browser_private'; import {LocationStrategy} from '@angular/common'; import {Log} from '@angular/core/testing'; diff --git a/modules/@angular/platform-server/tsconfig-es2015.json b/modules/@angular/platform-server/tsconfig-es2015.json index 60ce85739b..a67229b7c5 100644 --- a/modules/@angular/platform-server/tsconfig-es2015.json +++ b/modules/@angular/platform-server/tsconfig-es2015.json @@ -13,9 +13,13 @@ "outDir": "../../../dist/packages-dist/platform-server/esm", "paths": { "@angular/core": ["../../../dist/packages-dist/core/"], + "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], "@angular/common": ["../../../dist/packages-dist/common/"], + "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], "@angular/compiler": ["../../../dist/packages-dist/compiler/"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser/"] + "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], + "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser/"], + "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"] }, "rootDir": ".", "sourceMap": true, @@ -24,6 +28,8 @@ }, "files": [ "index.ts", + "testing.ts", + "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/@types/node/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ] diff --git a/modules/@angular/platform-server/tsconfig-es5.json b/modules/@angular/platform-server/tsconfig-es5.json index 2d7fef3dee..23539fc378 100644 --- a/modules/@angular/platform-server/tsconfig-es5.json +++ b/modules/@angular/platform-server/tsconfig-es5.json @@ -12,10 +12,14 @@ "moduleResolution": "node", "outDir": "../../../dist/packages-dist/platform-server/", "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] + "@angular/core": ["../../../dist/packages-dist/core/"], + "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], + "@angular/common": ["../../../dist/packages-dist/common/"], + "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], + "@angular/compiler": ["../../../dist/packages-dist/compiler/"], + "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"], + "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser/"], + "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"] }, "rootDir": ".", "sourceMap": true, @@ -25,6 +29,8 @@ }, "files": [ "index.ts", + "testing.ts", + "../../../node_modules/@types/jasmine/index.d.ts", "../../../node_modules/@types/node/index.d.ts", "../../../node_modules/zone.js/dist/zone.js.d.ts" ]