fix: Remove angular types (getsentry#1986)

HazAT · web-flow · commit 0bae2bdf1d5d · 2019-04-02T16:23:55.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.0.4
+
+- [integrations] fix: Not requiring angular types
+
 ## 5.0.3
 
 - [hub] fix: Don't reset registry when there is no hub on the carrier #1969
diff --git a/packages/integrations/package.json b/packages/integrations/package.json
@@ -21,7 +21,6 @@
     "@sentry/utils": "5.0.0"
   },
   "devDependencies": {
-    "@types/angular": "^1.6.54",
     "chai": "^4.1.2",
     "jest": "^24.5.0",
     "npm-run-all": "^4.1.2",
diff --git a/packages/integrations/src/angular.ts b/packages/integrations/src/angular.ts
@@ -28,7 +28,7 @@ export class Angular implements Integration {
   /**
    * Angular's instance
    */
-  private readonly _angular: ng.IAngularStatic;
+  private readonly _angular: any;
 
   /**
    * Returns current hub.
@@ -38,9 +38,9 @@ export class Angular implements Integration {
   /**
    * @inheritDoc
    */
-  public constructor(options: { angular?: ng.IAngularStatic } = {}) {
+  public constructor(options: { angular?: any } = {}) {
     // tslint:disable-next-line: no-unsafe-any
-    this._angular = options.angular || (getGlobalObject().angular as ng.IAngularStatic);
+    this._angular = options.angular || getGlobalObject().angular;
   }
 
   /**
@@ -54,18 +54,21 @@ export class Angular implements Integration {
 
     this._getCurrentHub = getCurrentHub;
 
+    // tslint:disable: no-unsafe-any
     this._angular.module(Angular.moduleName, []).config([
       '$provide',
-      ($provide: ng.auto.IProvideService) => {
+      ($provide: any) => {
         $provide.decorator('$exceptionHandler', ['$delegate', this._$exceptionHandlerDecorator.bind(this)]);
       },
     ]);
+    // tslint:enable: no-unsafe-any
   }
 
   /**
    * Angular's exceptionHandler for Sentry integration
    */
-  private _$exceptionHandlerDecorator($delegate: ng.IExceptionHandlerService): ng.IExceptionHandlerService {
+  // tslint:disable-next-line: no-unsafe-any
+  private _$exceptionHandlerDecorator($delegate: any): any {
     return (exception: Error, cause?: string) => {
       const hub = this._getCurrentHub && this._getCurrentHub();
 
@@ -100,6 +103,7 @@ export class Angular implements Integration {
           hub.captureException(exception);
         });
       }
+      // tslint:disable-next-line: no-unsafe-any
       $delegate(exception, cause);
     };
   }
diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "dist",
-    "types": ["node", "angular"]
+    "types": ["node"]
   },
   "include": ["src/**/*.ts"]
 }
diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "outDir": "esm",
-    "types": ["node", "angular"]
+    "types": ["node"]
   },
   "include": ["src/**/*"]
 }
diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json
@@ -4,6 +4,6 @@
   "exclude": ["dist"],
   "compilerOptions": {
     "rootDir": ".",
-    "types": ["node", "jest", "angular"]
+    "types": ["node", "jest"]
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "./packages/typescript/tsconfig.json",
   "compilerOptions": {
     "baseUrl": "packages",
-    "types": ["node", "angular"],
+    "types": ["node"],
     "paths": {
       "@sentry/*": ["*/src"],
       "raven-js": ["raven-js/src/singleton.js"],
diff --git a/yarn.lock b/yarn.lock
@@ -1140,11 +1140,6 @@
     highlight.js "^9.15.6"
     marked "^0.6.1"
 
-"@types/angular@^1.6.54":
-  version "1.6.54"
-  resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.54.tgz#f9d5a03e4da7b021a6dabe5d63e899ed4567a5bd"
-  integrity sha512-xA1FuozWXeRQ7FClUbvk8ePL+dydBeDoCWRPFTHU5+8uvVtIIfLGiHA8CMkwsbddFCYnTDVbLxG85a/HBx7LtA==
-
 "@types/babel__core@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.0.tgz#710f2487dda4dcfd010ca6abb2b4dc7394365c51"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"baseUrl": ".",`
`5`	`5`	`"outDir": "dist",`
`6`		`- "types": ["node", "angular"]`
	`6`	`+ "types": ["node"]`
`7`	`7`	`},`
`8`	`8`	`"include": ["src/*/.ts"]`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`"exclude": ["dist"],`
`5`	`5`	`"compilerOptions": {`
`6`	`6`	`"rootDir": ".",`
`7`		`- "types": ["node", "jest", "angular"]`
	`7`	`+ "types": ["node", "jest"]`
`8`	`8`	`}`
`9`	`9`	`}`