Merge pull request #3 from jeremypele/master

Fix Angular Package + Update discardUncaughtJsExceptions

Author: sc85

README.md

@@ -45,10 +45,13 @@ import { SentryModule } from 'nativescript-sentry/angular';
 NgModule({
   // ...
   imports: [
-       SentryModule.forRoot({dsn: 'https://<key>:<secret>@host/<project>'})
-  ],
+    SentryModule.forRoot({
+      dsn: 'https://<key>:<secret>@host/<project>',
+      discardUncaughtJsExceptions: true
+    })
+  ]
   // ...
-})
+});
 ```
 
 **Note:** this plugin adds a custom ErrorHandler to your angular app
@@ -180,6 +183,7 @@ in the dependencies. See the [demo app](/demo/app/App_Resources/Android/app.grad
 ## Demo Apps
 
 To run and test the demo apps you need to replace the placeholder `__YOUR_DSN_HERE__` by your own DSN in the following files:
+
 - demo/App_Resources/Android/src/main/AndroidManifest.xml
 - demo/app/app.ts
 - demo-ng/App_Resources/Android/src/main/AndroidManifest.xml
@@ -203,7 +207,7 @@ Thanks to [@bradmartin](https://github.com/bradmartin)!
 
 - Fix GitHub Workflow to use existing publishing scripts
 
-### 1.10.1 – (17.04.2020)
+### 1.10.1 – (17.04.2020)
 
 - Set up GitHub Workflow for npm publising
 

demo-ng/src/app.module.ts

@@ -11,7 +11,8 @@ import { HomeComponent } from './home.component';
     NativeScriptModule,
     AppRoutingModule,
     SentryModule.forRoot({
-      dsn: '__YOUR_DSN_HERE__'
+      dsn: '__YOUR_DSN_HERE__',
+      discardUncaughtJsExceptions: false
     })
   ],
   declarations: [AppComponent, HomeComponent],

package-lock.json

@@ -29,6 +29,7 @@ pack() {
     echo 'Building /src...'
     cd "$TO_SOURCE_DIR"
     node_modules/.bin/tsc
+    node_modules/.bin/ngc -skipLibCheck --project tsconfig.aot.json --outDir ./
     cd ..
 
     echo 'Creating package...'

publish/pack.sh

@@ -2,6 +2,7 @@ import { InjectionToken, ModuleWithProviders } from '@angular/core';
 import { SentryErrorHandler } from './error.handler';
 export interface SentryConfig {
     dsn: string;
+    discardUncaughtJsExceptions?: boolean;
 }
 export declare const SentryService: InjectionToken<SentryConfig>;
 export declare class SentryModule {

src/angular/app.module.d.ts

@@ -3,6 +3,7 @@ import { SentryErrorHandler } from './error.handler';
 
 export interface SentryConfig {
   dsn: string;
+  discardUncaughtJsExceptions?: boolean;
 }
 
 export const SentryService = new InjectionToken<SentryConfig>('SentryConfig');

src/angular/app.module.ts

@@ -1,9 +1,7 @@
 import { ErrorHandler } from '@angular/core';
-export declare class SentryErrorHandler extends ErrorHandler {
-    private config;
-    private _discardUncaughtJsExceptions;
-    constructor(config: any);
+export declare class SentryErrorHandler implements ErrorHandler {
+    private _config;
+    constructor(_config: any);
     handleError(err: any): void;
     private _setDSN;
-    private _setDiscardUncaughtJsExceptions;
 }

src/angular/error.handler.d.ts

@@ -3,13 +3,9 @@ import { Sentry } from '../';
 import { SentryService } from './app.module';
 
 @Injectable()
-export class SentryErrorHandler extends ErrorHandler {
-  private _discardUncaughtJsExceptions: boolean = false;
-
-  constructor(@Inject(SentryService) private config) {
-    super();
+export class SentryErrorHandler implements ErrorHandler {
+  constructor(@Inject(SentryService) private _config) {
     this._setDSN();
-    this._setDiscardUncaughtJsExceptions();
   }
 
   handleError(err): void {
@@ -19,7 +15,7 @@ export class SentryErrorHandler extends ErrorHandler {
       console.log('[NativeScript-Sentry - SentryErrorHandler]', e);
     }
 
-    if (this._discardUncaughtJsExceptions) return;
+    if (this._config?.discardUncaughtJsExceptions) return;
     throw err;
   }
 
@@ -28,19 +24,10 @@ export class SentryErrorHandler extends ErrorHandler {
    */
 
   private _setDSN() {
-    if (this.config && this.config.dsn) {
-      Sentry.init(this.config.dsn);
+    if (this._config?.dsn) {
+      Sentry.init(this._config.dsn);
     } else {
       throw '[SentryAngular]: You need to provide your dsn on the forRoot method';
     }
   }
-
-  private _setDiscardUncaughtJsExceptions() {
-    try {
-      const packageJSON = require('~/package.json');
-      if (packageJSON && packageJSON.discardUncaughtJsExceptions) {
-        this._discardUncaughtJsExceptions = packageJSON.discardUncaughtJsExceptions;
-      }
-    } catch (e) {}
-  }
 }

src/angular/error.handler.ts

@@ -0,0 +1,38 @@
+{
+  "name": "nativescript-sentry",
+  "ngPackage": {
+    "lib": {
+      "entryFile": "index.ts",
+      "umdModuleIds": {
+        "@nativescript/core": "ns-core",
+        "@nativescript/angular": "ns-angular",
+        "nativescript-sentry": "ns-sentry"
+      }
+    },
+    "whitelistedNonPeerDependencies": [
+      "."
+    ]
+  },
+  "scripts": {
+    "build": "npm i && ng-packagr -p package.json && cd dist && cpy '**/*' '.' --parents",
+    "clean": "npx rimraf node_modules dist package-lock.json -- *.js"
+  },
+  "devDependencies": {
+    "@angular/compiler-cli": "~10.0.0",
+    "@angular/common": "~10.0.0",
+    "@angular/compiler": "~10.0.0",
+    "@angular/core": "~10.0.0",
+    "@angular/platform-browser": "~10.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@angular/router": "~10.0.0",
+    "@nativescript/angular": "~10.0.0",
+    "@nativescript/core": "~7.0.0",
+    "cpy-cli": "~3.1.1",
+    "nativescript-sentry": "file:../src",
+    "ng-packagr": "~10.0.0",
+    "rxjs": "^6.6.0",
+    "tslint": "^5.14.0",
+    "typescript": "~3.9.0",
+    "zone.js": "^0.10.3"
+  }
+}