@sentry/ember 7.16.0 → 7.17.0

package/LICENSE

@@ -1,9 +1,14 @@
-The MIT License (MIT)
+Copyright (c) 2020 Sentry (https://sentry.io) and individual contributors. All rights reserved.
 
-Copyright (c) 2020, Sentry
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -172,7 +172,8 @@ ENV['@sentry/ember'] = {
 
 ### Supported Versions
 
-`@sentry/ember` currently supports Ember **4.0+** for error monitoring.
+* **Ember.js**: v4.0 or above
+* **Node**: v14 or above
 
 ### Previous Integration
 

package/addon/instance-initializers/sentry-performance.ts

@@ -1,6 +1,6 @@
 import ApplicationInstance from '@ember/application/instance';
-import Ember from 'ember';
 import { run, _backburner, scheduleOnce } from '@ember/runloop';
+import { subscribe } from '@ember/instrumentation';
 import * as Sentry from '@sentry/browser';
 import { ExtendedBackburner } from '@sentry/ember/runloop';
 import { Span, Transaction, Integration } from '@sentry/types';
@@ -9,6 +9,7 @@ import { getActiveTransaction } from '..';
 import { browserPerformanceTimeOrigin, GLOBAL_OBJ, timestampWithMs } from '@sentry/utils';
 import { macroCondition, isTesting, getOwnConfig } from '@embroider/macros';
 import { EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
+import RouterService from '@ember/routing/router-service';
 
 function getSentryConfig() {
   const _global = GLOBAL_OBJ as typeof GLOBAL_OBJ & GlobalConfig;
@@ -279,7 +280,6 @@ function _instrumentComponents(config: EmberSentryConfig) {
   const beforeEntries = {} as RenderEntries;
   const beforeComponentDefinitionEntries = {} as RenderEntries;
 
-  const subscribe = Ember.subscribe;
   function _subscribeToRenderEvents() {
     subscribe('render.component', {
       before(_name: string, _timestamp: number, payload: Payload) {
@@ -309,13 +309,14 @@ function _instrumentInitialLoad(config: EmberSentryConfig) {
   const startName = '@sentry/ember:initial-load-start';
   const endName = '@sentry/ember:initial-load-end';
 
-  const { performance } = window;
-  const HAS_PERFORMANCE = performance && performance.clearMarks && performance.clearMeasures;
+  let { HAS_PERFORMANCE, HAS_PERFORMANCE_TIMING } = _hasPerformanceSupport();
 
   if (!HAS_PERFORMANCE) {
     return;
   }
 
+  const { performance } = window;
+
   if (config.disableInitialLoadInstrumentation) {
     performance.clearMarks(startName);
     performance.clearMarks(endName);
@@ -323,8 +324,6 @@ function _instrumentInitialLoad(config: EmberSentryConfig) {
   }
 
   // Split performance check in two so clearMarks still happens even if timeOrigin isn't available.
-  const HAS_PERFORMANCE_TIMING =
-    performance.measure && performance.getEntriesByName && browserPerformanceTimeOrigin !== undefined;
   if (!HAS_PERFORMANCE_TIMING) {
     return;
   }
@@ -355,6 +354,26 @@ function _instrumentInitialLoad(config: EmberSentryConfig) {
   performance.clearMeasures(measureName);
 }
 
+function _hasPerformanceSupport() {
+  // TS says that all of these methods are always available, but some of them may not be supported in older browsers
+  // So we "pretend" they are all optional in order to be able to check this properly without TS complaining
+  const _performance = window.performance as {
+    clearMarks?: Performance['clearMarks'];
+    clearMeasures?: Performance['clearMeasures'];
+    measure?: Performance['measure'];
+    getEntriesByName?: Performance['getEntriesByName'];
+  };
+  const HAS_PERFORMANCE = Boolean(_performance && _performance.clearMarks && _performance.clearMeasures);
+  const HAS_PERFORMANCE_TIMING = Boolean(
+    _performance.measure && _performance.getEntriesByName && browserPerformanceTimeOrigin !== undefined,
+  );
+
+  return {
+    HAS_PERFORMANCE,
+    HAS_PERFORMANCE_TIMING,
+  };
+}
+
 export async function instrumentForPerformance(appInstance: ApplicationInstance) {
   const config = getSentryConfig();
   const sentryConfig = config.sentry;
@@ -372,7 +391,9 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
     new tracing.Integrations.BrowserTracing({
       routingInstrumentation: (customStartTransaction, startTransactionOnPageLoad) => {
         const routerMain = appInstance.lookup('router:main');
-        let routerService = appInstance.lookup('service:router');
+        let routerService = appInstance.lookup('service:router') as
+          | RouterService & { externalRouter?: RouterService; _hasMountedSentryPerformanceRouting?: boolean };
+
         if (routerService.externalRouter) {
           // Using ember-engines-router-service in an engine.
           routerService = routerService.externalRouter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -21,64 +21,68 @@
     "build:extras": "yarn build",
     "build:npm": "ember ts:precompile && npm pack && ember ts:clean",
     "clean": "yarn rimraf sentry-ember-*.tgz",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
+    "lint": "run-p lint:js lint:hbs lint:ts",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint . --cache --cache-location '../../eslintcache/'",
+    "lint:ts": "tsc",
     "start": "ember serve",
-    "test": "ember try:each",
-    "test:all": "node ./scripts/run-CI-tests.js"
+    "test": "ember test",
+    "test:all": "ember try:each"
   },
   "dependencies": {
-    "@embroider/macros": "1.8.3",
-    "@sentry/browser": "7.16.0",
-    "@sentry/tracing": "7.16.0",
-    "@sentry/types": "7.16.0",
-    "@sentry/utils": "7.16.0",
-    "ember-auto-import": "~1.12.1 || ~2.2.0",
-    "ember-cli-babel": "~7.26.6",
-    "ember-cli-htmlbars": "^6.0.1",
-    "ember-cli-typescript": "^4.2.1"
+    "@embroider/macros": "^1.9.0",
+    "@sentry/browser": "7.17.0",
+    "@sentry/tracing": "7.17.0",
+    "@sentry/types": "7.17.0",
+    "@sentry/utils": "7.17.0",
+    "ember-auto-import": "^1.12.1 || ^2.4.3",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.1.1",
+    "ember-cli-typescript": "^5.1.1"
   },
   "devDependencies": {
     "@ember/optional-features": "~1.3.0",
-    "@embroider/test-setup": "~0.47.2",
-    "@glimmer/component": "~1.0.0",
-    "@glimmer/tracking": "~1.0.0",
+    "@ember/test-helpers": "~2.8.1",
+    "@embroider/test-setup": "~1.8.3",
+    "@glimmer/component": "~1.1.2",
+    "@glimmer/tracking": "~1.1.2",
     "@types/ember": "~3.16.5",
     "@types/ember-qunit": "~3.4.9",
     "@types/ember__debug": "^3.16.5",
     "@types/ember__test-helpers": "~1.7.0",
     "@types/qunit": "~2.9.1",
     "@types/rsvp": "~4.0.3",
-    "babel-eslint": "^10.1.0",
+    "babel-eslint": "~10.1.0",
     "broccoli-asset-rev": "~3.0.0",
-    "ember-cli": "~3.24.0",
-    "ember-cli-dependency-checker": "~3.2.0",
-    "ember-cli-inject-live-reload": "~2.0.2",
+    "ember-cli": "~4.8.0",
+    "ember-cli-dependency-checker": "~3.3.1",
+    "ember-cli-inject-live-reload": "~2.1.0",
     "ember-cli-sri": "~2.1.1",
     "ember-cli-typescript-blueprints": "~3.0.0",
     "ember-cli-uglify": "~3.0.0",
     "ember-disable-prototype-extensions": "~1.1.3",
-    "ember-export-application-global": "~2.0.1",
     "ember-load-initializers": "~2.1.1",
-    "ember-maybe-import-regenerator": "~0.1.6",
-    "ember-qunit": "~4.6.0",
-    "ember-resolver": "~8.0.0",
-    "ember-sinon-qunit": "~5.0.0",
-    "ember-source": "~3.20.0",
+    "ember-maybe-import-regenerator": "~1.0.0",
+    "ember-qunit": "~6.0.0",
+    "ember-resolver": "~8.0.3",
+    "ember-sinon-qunit": "~6.0.0",
+    "ember-source": "~4.8.0",
     "ember-source-channel-url": "~2.0.1",
-    "ember-template-lint": "~2.9.1",
-    "ember-test-selectors": "~5.5.0",
-    "ember-try": "~1.4.0",
-    "ember-window-mock": "~0.7.1",
-    "eslint-plugin-ember": "~8.6.0",
-    "eslint-plugin-node": "^11.1.0",
+    "ember-template-lint": "~4.16.1",
+    "ember-test-selectors": "~6.0.0",
+    "ember-try": "~2.0.0",
+    "ember-window-mock": "~0.8.1",
+    "eslint-plugin-ember": "~11.1.0",
+    "eslint-plugin-node": "~11.1.0",
+    "eslint-plugin-qunit": "~7.3.1",
     "loader.js": "~4.7.0",
-    "qunit-dom": "~1.2.0",
-    "webpack": "^5.65.0"
+    "qunit": "~2.19.2",
+    "qunit-dom": "~2.0.0",
+    "typescript": "~4.5.2",
+    "webpack": "~5.74.0"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"
@@ -87,7 +91,6 @@
     "configPath": "tests/dummy/config"
   },
   "volta": {
-    "node": "14.15.4",
-    "yarn": "1.22.5"
+    "extends": "../../package.json"
   }
 }

package/types/global.d.ts

@@ -4,3 +4,11 @@ declare module '@sentry/ember/templates/*' {
   const tmpl: TemplateFactory;
   export default tmpl;
 }
+
+/**
+ * This is private as of now.
+ * See https://github.com/emberjs/ember.js/blob/master/packages/@ember/instrumentation/index.ts
+ */
+declare module '@ember/instrumentation' {
+  export function subscribe(pattern: string, object: {}): any;
+}

package/addon/ember.d.ts

@@ -1,6 +0,0 @@
-import Ember from 'ember';
-declare module 'ember' {
-  namespace Ember {
-    export function subscribe(pattern: string, object: {}): any;
-  }
-}

package/ember.d.ts

@@ -1,6 +0,0 @@
-import Ember from 'ember';
-declare module 'ember' {
-  namespace Ember {
-    export function subscribe(pattern: string, object: {}): any;
-  }
-}

package/scripts/run-CI-tests.js

@@ -1,17 +0,0 @@
-/*eslint-env node*/
-const { spawnSync } = require('child_process');
-
-console.log('Mimicking the CI environment in order to run tests against multiple versions of Ember');
-
-const result = spawnSync('yarn test', {
-  shell: true,
-  stdio: 'inherit',
-  env: {
-    ...process.env,
-    GITHUB_ACTIONS: true,
-    GITHUB_EVENT_NAME: 'push',
-    GITHUB_HEAD_REF: 'master',
-  },
-});
-
-process.exit(result.status);