From d7f42bfbe63c269293c3c19f182e86a529a09b7f Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Thu, 17 Aug 2017 15:52:24 +0200 Subject: [PATCH] refactor(platform-browser): remove deprecated `NgProbeToken` (#18760) BREAKING CHANGE: `NgProbeToken` has been removed from `@angular/platform-browser` as it was deprecated since v4. Import it from `@angular/core` instead. PR Close #18760 --- .../platform-browser/src/dom/debug/ng_probe.ts | 16 +++------------- .../platform-browser/src/platform-browser.ts | 1 - .../platform-browser/platform-browser.d.ts | 7 ------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/packages/platform-browser/src/dom/debug/ng_probe.ts b/packages/platform-browser/src/dom/debug/ng_probe.ts index e74b9cb3d2e05..fff61b86adb26 100644 --- a/packages/platform-browser/src/dom/debug/ng_probe.ts +++ b/packages/platform-browser/src/dom/debug/ng_probe.ts @@ -26,22 +26,13 @@ export function inspectNativeElement(element: any): core.DebugNode|null { return core.getDebugNode(element); } -/** - * Deprecated. Use the one from '@angular/core'. - * @deprecated - */ -export class NgProbeToken { - constructor(public name: string, public token: any) {} -} - -export function _createNgProbe(extraTokens: NgProbeToken[], coreTokens: core.NgProbeToken[]): any { - const tokens = (extraTokens || []).concat(coreTokens || []); +export function _createNgProbe(coreTokens: core.NgProbeToken[]): any { exportNgVar(INSPECT_GLOBAL_NAME, inspectNativeElement); - exportNgVar(CORE_TOKENS_GLOBAL_NAME, {...CORE_TOKENS, ..._ngProbeTokensToMap(tokens || [])}); + exportNgVar(CORE_TOKENS_GLOBAL_NAME, {...CORE_TOKENS, ..._ngProbeTokensToMap(coreTokens || [])}); return () => inspectNativeElement; } -function _ngProbeTokensToMap(tokens: NgProbeToken[]): {[name: string]: any} { +function _ngProbeTokensToMap(tokens: core.NgProbeToken[]): {[name: string]: any} { return tokens.reduce((prev: any, t: any) => (prev[t.name] = t.token, prev), {}); } @@ -53,7 +44,6 @@ export const ELEMENT_PROBE_PROVIDERS: core.Provider[] = [ provide: core.APP_INITIALIZER, useFactory: _createNgProbe, deps: [ - [NgProbeToken, new core.Optional()], [core.NgProbeToken, new core.Optional()], ], multi: true, diff --git a/packages/platform-browser/src/platform-browser.ts b/packages/platform-browser/src/platform-browser.ts index deb1df279fea5..1a8c9171c0af0 100644 --- a/packages/platform-browser/src/platform-browser.ts +++ b/packages/platform-browser/src/platform-browser.ts @@ -11,7 +11,6 @@ export {Meta, MetaDefinition} from './browser/meta'; export {Title} from './browser/title'; export {disableDebugTools, enableDebugTools} from './browser/tools/tools'; export {By} from './dom/debug/by'; -export {NgProbeToken} from './dom/debug/ng_probe'; export {DOCUMENT} from './dom/dom_tokens'; export {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager'; export {HAMMER_GESTURE_CONFIG, HammerGestureConfig} from './dom/events/hammer_gestures'; diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/platform-browser.d.ts index 45d0d2ef66aed..dcd7a2b1ebd76 100644 --- a/tools/public_api_guard/platform-browser/platform-browser.d.ts +++ b/tools/public_api_guard/platform-browser/platform-browser.d.ts @@ -82,13 +82,6 @@ export declare type MetaDefinition = { [prop: string]: string; }; -/** @deprecated */ -export declare class NgProbeToken { - name: string; - token: any; - constructor(name: string, token: any); -} - /** @stable */ export declare const platformBrowser: (extraProviders?: StaticProvider[]) => PlatformRef;