Revert "feat(upgrade): allow setting the angularjs lib at runtime (#15168)"

This reverts commit 8ad464d90e.

Breaks G3.

packages/upgrade/src/common/angular1.ts

@@ -201,7 +201,6 @@ function noNg() {
   throw new Error('AngularJS v1.x is not loaded!');
 }
 
-
 let angular: {
   bootstrap: (e: Element, modules: (string | IInjectable)[], config: IAngularBootstrapConfig) =>
                  void,
@@ -209,62 +208,27 @@ let angular: {
   element: (e: Element | string) => IAugmentedJQuery,
   version: {major: number}, resumeBootstrap?: () => void,
   getTestability: (e: Element) => ITestabilityService
-};
-
-try {
-  if (window.hasOwnProperty('angular')) {
-    setAngularLib((<any>window).angular);
-  }
-} catch (e) {
-  setAngularLib(<any>{
+} = <any>{
   bootstrap: noNg,
   module: noNg,
   element: noNg,
   version: noNg,
   resumeBootstrap: noNg,
   getTestability: noNg
-  });
-}
-
-/**
- * Resets the AngularJS library.
- *
- * Used when angularjs is loaded lazily, and not available on `window`.
- *
- * @stable
- */
-export function setAngularLib(ng: any): void {
-  angular = ng;
-}
-
-/**
- * Returns the current version of the AngularJS library.
- *
- * @stable
- */
-export function getAngularLib(): any {
-  return angular;
-}
-
-export function bootstrap(
-    e: Element, modules: (string | IInjectable)[], config: IAngularBootstrapConfig): void {
-  angular.bootstrap(e, modules, config);
-}
-
-export function module(prefix: string, dependencies?: string[]): IModule {
-  return angular.module(prefix, dependencies);
-}
-
-export function element(e: Element | string): IAugmentedJQuery {
-  return angular.element(e);
-}
-
-export function resumeBootstrap(): void {
-  angular.resumeBootstrap();
-}
-
-export function getTestability(e: Element): ITestabilityService {
-  return angular.getTestability(e);
+};
+
+
+try {
+  if (window.hasOwnProperty('angular')) {
+    angular = (<any>window).angular;
+  }
+} catch (e) {
+  // ignore in CJS mode.
 }
 
+export const bootstrap = angular.bootstrap;
+export const module = angular.module;
+export const element = angular.element;
 export const version = angular.version;
+export const resumeBootstrap = angular.resumeBootstrap;
+export const getTestability = angular.getTestability;

packages/upgrade/static/public_api.ts

@@ -12,7 +12,6 @@
  * Entry point for all public APIs of the upgrade/static package, allowing
  * Angular 1 and Angular 2+ to run side by side in the same application.
  */
-export {getAngularLib, setAngularLib} from './src/common/angular1';
 export {downgradeComponent} from './src/common/downgrade_component';
 export {downgradeInjectable} from './src/common/downgrade_injectable';
 export {VERSION} from './src/common/version';

packages/upgrade/test/static/integration/injection_spec.ts

@@ -12,7 +12,7 @@ import {BrowserModule} from '@angular/platform-browser';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import * as angular from '@angular/upgrade/src/common/angular1';
 import {$INJECTOR, INJECTOR_KEY} from '@angular/upgrade/src/common/constants';
-import {UpgradeModule, downgradeInjectable, getAngularLib, setAngularLib} from '@angular/upgrade/static';
+import {UpgradeModule, downgradeInjectable} from '@angular/upgrade/static';
 
 import {bootstrap, html} from '../test_helpers';
 
@@ -99,33 +99,5 @@ export function main() {
            expect(runBlockTriggered).toBeTruthy();
          });
        }));
-
-    it('should allow resetting angular at runtime', async(() => {
-         let wrappedBootstrapepedCalled = false;
-
-         const n: any = getAngularLib();
-
-         setAngularLib({
-           bootstrap: (...args: any[]) => {
-             wrappedBootstrapepedCalled = true;
-             n.bootstrap(...args);
-           },
-           module: n.module,
-           element: n.element,
-           version: n.version,
-           resumeBootstrap: n.resumeBootstrap,
-           getTestability: n.getTestability
-         });
-
-         @NgModule({imports: [BrowserModule, UpgradeModule]})
-         class Ng2Module {
-           ngDoBootstrap() {}
-         }
-
-         const ng1Module = angular.module('ng1Module', []);
-
-         bootstrap(platformBrowserDynamic(), Ng2Module, html('<div>'), ng1Module)
-             .then((upgrade) => { expect(wrappedBootstrapepedCalled).toEqual(true); });
-       }));
   });
 }

tools/public_api_guard/upgrade/static.d.ts

@@ -9,12 +9,6 @@ export declare function downgradeComponent(info: {
 /** @experimental */
 export declare function downgradeInjectable(token: any): Function;
 
-/** @stable */
-export declare function getAngularLib(): any;
-
-/** @stable */
-export declare function setAngularLib(ng: any): void;
-
 /** @experimental */
 export declare class UpgradeComponent implements OnInit, OnChanges, DoCheck, OnDestroy {
     constructor(name: string, elementRef: ElementRef, injector: Injector);