feat: adds Angular 13 support, closes #18

BREAKING CHANGE: the minimum Angular version is 13
Tinkoff · Jun 9, 2022 · 768aca0 · 768aca0
1 parent 64fccf6
commit 768aca0
Show file tree

Hide file tree

Showing 34 changed files with 4,030 additions and 6,178 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -66,7 +66,8 @@
             "parallel": false
           }
         }
-      }
+      },
+      "tags": []
     },
     "browser": {
       "projectType": "library",
@@ -133,7 +134,8 @@
             "parallel": false
           }
         }
-      }
+      },
+      "tags": []
     },
     "core": {
       "projectType": "library",
@@ -200,7 +202,8 @@
             "parallel": false
           }
         }
-      }
+      },
+      "tags": []
     },
     "docs": {
       "projectType": "application",
@@ -342,7 +345,8 @@
             "production": {}
           }
         }
-      }
+      },
+      "tags": []
     }
   }
 }
diff --git a/apps/docs/jest.config.js b/apps/docs/jest.config.js
@@ -15,5 +15,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };
diff --git a/apps/docs/src/polyfills.ts b/apps/docs/src/polyfills.ts
@@ -18,16 +18,6 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

diff --git a/apps/docs/src/test-setup.ts b/apps/docs/src/test-setup.ts
@@ -1 +1,14 @@
 import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: false } }
+);
diff --git a/apps/docs/tsconfig.server.json b/apps/docs/tsconfig.server.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.app.json",
   "compilerOptions": {

diff --git a/apps/docs/tsconfig.spec.json b/apps/docs/tsconfig.spec.json
@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }
diff --git a/libs/angular/jest.config.js b/libs/angular/jest.config.js
@@ -15,5 +15,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };
diff --git a/libs/angular/ng-package.json b/libs/angular/ng-package.json
@@ -4,5 +4,5 @@
   "lib": {
     "entryFile": "src/index.ts"
   },
-  "whitelistedNonPeerDependencies": ["@micro-sentry/browser"]
+  "allowedNonPeerDependencies": ["@micro-sentry/browser"]
 }
diff --git a/libs/angular/package.json b/libs/angular/package.json
@@ -2,8 +2,8 @@
   "name": "@micro-sentry/angular",
   "version": "0.0.0-development",
   "peerDependencies": {
-    "@angular/common": "^12.0.0",
-    "@angular/core": "^12.0.0",
+    "@angular/common": "^13.0.0",
+    "@angular/core": "^13.0.0",
     "@ng-web-apis/common": "^1.12.0"
   },
   "dependencies": {

diff --git a/libs/angular/src/lib/services/micro-sentry-error-bus.service.ts b/libs/angular/src/lib/services/micro-sentry-error-bus.service.ts
@@ -10,7 +10,8 @@ import { MICRO_SENTRY_ERRORS_THROTTLE } from '../tokens/errors-throttle';
 
 @Injectable()
 export class MicroSentryErrorBusService
-  implements NextObserver<any>, OnDestroy {
+  implements NextObserver<any>, OnDestroy
+{
   private _errors$ = new Subject<any>();
   errors$: Observable<any>;
 

diff --git a/libs/angular/src/lib/services/micro-sentry.service.ts b/libs/angular/src/lib/services/micro-sentry.service.ts
@@ -26,7 +26,7 @@ export class MicroSentryService
     this.http = new HttpClient(httpBackend);
   }
 
-  createRequest(body: SentryRequestBody) {
+  override createRequest(body: SentryRequestBody) {
     this.http
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       .post(this.apiUrl!, body, {
@@ -35,7 +35,7 @@ export class MicroSentryService
       .subscribe();
   }
 
-  protected getRequestBlank(): SentryRequestBody {
+  protected override getRequestBlank(): SentryRequestBody {
     return {
       ...super.getRequestBlank(),
       sdk: {

diff --git a/libs/angular/src/test-setup.ts b/libs/angular/src/test-setup.ts
@@ -1 +1,14 @@
 import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: false } }
+);
diff --git a/libs/angular/tsconfig.lib.json b/libs/angular/tsconfig.lib.json
@@ -14,6 +14,6 @@
     "strictMetadataEmit": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/libs/angular/tsconfig.lib.prod.json b/libs/angular/tsconfig.lib.prod.json
@@ -1,10 +1,9 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {
     "declarationMap": false
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/libs/angular/tsconfig.spec.json b/libs/angular/tsconfig.spec.json
@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }
diff --git a/libs/browser/jest.config.js b/libs/browser/jest.config.js
@@ -15,5 +15,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };
diff --git a/libs/browser/ng-package.json b/libs/browser/ng-package.json
@@ -4,5 +4,5 @@
   "lib": {
     "entryFile": "src/index.ts"
   },
-  "whitelistedNonPeerDependencies": ["@micro-sentry/core"]
+  "allowedNonPeerDependencies": ["@micro-sentry/core"]
 }
diff --git a/libs/browser/src/lib/plugins/breadcrumb-plugin.ts b/libs/browser/src/lib/plugins/breadcrumb-plugin.ts
@@ -195,7 +195,7 @@ export class BreadcrumbPlugin implements MicroSentryPlugin {
     try {
       target = event.target
         ? htmlTreeAsString(event.target as Node)
-        : htmlTreeAsString((event as unknown) as Node);
+        : htmlTreeAsString(event as unknown as Node);
     } catch (e) {
       target = '<unknown>';
     }
@@ -305,14 +305,9 @@ export class BreadcrumbPlugin implements MicroSentryPlugin {
   }
 
   private initConsole() {
-    ([
-      'debug',
-      'info',
-      'warn',
-      'error',
-      'log',
-      'assert',
-    ] as (keyof Console)[]).forEach((level) => {
+    (
+      ['debug', 'info', 'warn', 'error', 'log', 'assert'] as (keyof Console)[]
+    ).forEach((level) => {
       if (!(level in window.console)) {
         return;
       }

diff --git a/libs/browser/src/lib/services/browser-micro-sentry-client.ts b/libs/browser/src/lib/services/browser-micro-sentry-client.ts
@@ -161,7 +161,7 @@ export class BrowserMicroSentryClient extends MicroSentryClient {
     );
   }
 
-  protected getRequestBlank(): SentryRequestBody {
+  protected override getRequestBlank(): SentryRequestBody {
     return {
       request: {
         url: this.window.location.toString(),
@@ -178,7 +178,7 @@ export class BrowserMicroSentryClient extends MicroSentryClient {
     };
   }
 
-  protected send(request: SentryRequestBody) {
+  protected override send(request: SentryRequestBody) {
     if (
       this.destroyed ||
       this.isDeniedUrl(request) ||

diff --git a/libs/browser/src/lib/utils/parse-url.ts b/libs/browser/src/lib/utils/parse-url.ts
@@ -1,6 +1,4 @@
-export function parseUrl(
-  url: string
-): {
+export function parseUrl(url: string): {
   host?: string;
   path?: string;
   protocol?: string;

diff --git a/libs/browser/src/test-setup.ts b/libs/browser/src/test-setup.ts
@@ -1 +1,14 @@
 import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: false } }
+);
diff --git a/libs/browser/tsconfig.lib.json b/libs/browser/tsconfig.lib.json
@@ -14,6 +14,6 @@
     "strictMetadataEmit": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/libs/browser/tsconfig.lib.prod.json b/libs/browser/tsconfig.lib.prod.json
@@ -1,10 +1,9 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {
     "declarationMap": false
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/libs/browser/tsconfig.spec.json b/libs/browser/tsconfig.spec.json
@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }
diff --git a/libs/core/jest.config.js b/libs/core/jest.config.js
@@ -15,5 +15,8 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  transform: { '^.+\\.(ts|js|html)$': 'jest-preset-angular' },
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
 };
diff --git a/libs/core/src/lib/consts/consts.ts b/libs/core/src/lib/consts/consts.ts
@@ -1,15 +1,19 @@
 // @for-internal-use
 // Chromium based browsers: Chrome, Brave, new Opera, new Edge
-export const CHROME_REGEXP = /^\s*at (?:(.*?) ?\()?((?:file|https?|blob|chrome-extension|address|native|eval|webpack|<anonymous>|[-a-z]+:|.*bundle|\/).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i;
+export const CHROME_REGEXP =
+  /^\s*at (?:(.*?) ?\()?((?:file|https?|blob|chrome-extension|address|native|eval|webpack|<anonymous>|[-a-z]+:|.*bundle|\/).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i;
 // gecko regex: `(?:bundle|\d+\.js)`: `bundle` is for react native, `\d+\.js` also but specifically for ram bundles because it
 // generates filenames without a prefix like `file://` the filenames in the stacktrace are just 42.js
 // We need this specific case for now because we want no other regex to match.
-export const GECKO_REGEXP = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i;
-export const WINJS_REGEXP = /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i;
+export const GECKO_REGEXP =
+  /^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i;
+export const WINJS_REGEXP =
+  /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i;
 
 export const UNKNOWN_FUNCTION = '?';
 export const AUTH_HEADER = 'X-Sentry-Auth';
 
 //                          |protocol     |public |secret      |host      |port       |projectId
 //                          |             |       |            |          |           |
-export const DSN_REGEXP = /^(?:(\w+):)\/\/(?:(\w+)(?::(\w+))?@)([\w.-]+)(?::(\d+))?\/(.+)/;
+export const DSN_REGEXP =
+  /^(?:(\w+):)\/\/(?:(\w+)(?::(\w+))?@)([\w.-]+)(?::(\d+))?\/(.+)/;
diff --git a/libs/core/src/test-setup.ts b/libs/core/src/test-setup.ts
@@ -1 +1,14 @@
 import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: false } }
+);
diff --git a/libs/core/tsconfig.lib.json b/libs/core/tsconfig.lib.json
@@ -14,6 +14,6 @@
     "strictMetadataEmit": true,
     "enableResourceInlining": true
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/libs/core/tsconfig.lib.prod.json b/libs/core/tsconfig.lib.prod.json
@@ -1,10 +1,9 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {
     "declarationMap": false
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
 }
diff --git a/libs/core/tsconfig.spec.json b/libs/core/tsconfig.spec.json
@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }