feat(ember)!: Update to v2 addon format

dev-packages/e2e-tests/test-applications/ember-classic/app/app.ts

@@ -6,8 +6,11 @@ import Resolver from 'ember-resolver';
 import config from './config/environment';
 
 Sentry.init({
+  dsn: config.sentryDsn,
+  tracesSampleRate: 1,
   replaysSessionSampleRate: 1,
   replaysOnErrorSampleRate: 1,
+  tracePropagationTargets: ['localhost', 'doesntexist.example'],
   tunnel: `http://localhost:3031/`, // proxy server
 });
 

dev-packages/e2e-tests/test-applications/ember-classic/app/config/environment.d.ts

@@ -11,6 +11,7 @@ declare const config: {
   podModulePrefix: string;
   locationType: 'history' | 'hash' | 'none' | 'auto';
   rootURL: string;
+  sentryDsn: string;
   APP: Record<string, unknown>;
 };
 

dev-packages/e2e-tests/test-applications/ember-classic/app/instance-initializers/sentry-performance.ts

@@ -0,0 +1,14 @@
+import type ApplicationInstance from '@ember/application/instance';
+import { addIntegration, browserTracingIntegration } from '@sentry/ember';
+
+export function initialize(appInstance: ApplicationInstance): void {
+  addIntegration(browserTracingIntegration({
+    appInstance,
+    minimumRunloopQueueDuration: 0,
+    minimumComponentRenderDuration: 0,
+  }));
+}
+
+export default {
+  initialize,
+};

dev-packages/e2e-tests/test-applications/ember-classic/config/environment.js

@@ -19,22 +19,7 @@ module.exports = function (environment) {
     },
   };
 
-  ENV['@sentry/ember'] = {
-    sentry: {
-      tracesSampleRate: 1,
-      dsn: process.env.E2E_TEST_DSN,
-      tracePropagationTargets: ['localhost', 'doesntexist.example'],
-      browserTracingOptions: {
-        _experiments: {
-          // This lead to some flaky tests, as that is sometimes logged
-          enableLongTask: false,
-        },
-      },
-    },
-    ignoreEmberOnErrorWarning: true,
-    minimumRunloopQueueDuration: 0,
-    minimumComponentRenderDuration: 0,
-  };
+  ENV.sentryDsn = process.env.E2E_TEST_DSN;
 
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;

dev-packages/e2e-tests/test-applications/ember-embroider/app/app.ts

@@ -5,8 +5,11 @@ import loadInitializers from 'ember-load-initializers';
 import Resolver from 'ember-resolver';
 
 Sentry.init({
+  dsn: config.sentryDsn,
+  tracesSampleRate: 1,
   replaysSessionSampleRate: 1,
   replaysOnErrorSampleRate: 1,
+  tracePropagationTargets: ['localhost', 'doesntexist.example'],
   tunnel: `http://localhost:3031/`, // proxy server
 });
 export default class App extends Application {

dev-packages/e2e-tests/test-applications/ember-embroider/app/config/environment.d.ts

@@ -11,6 +11,7 @@ declare const config: {
   podModulePrefix: string;
   locationType: 'history' | 'hash' | 'none' | 'auto';
   rootURL: string;
+  sentryDsn: string;
   APP: Record<string, unknown>;
 };
 

dev-packages/e2e-tests/test-applications/ember-embroider/app/instance-initializers/sentry-performance.ts

@@ -0,0 +1,14 @@
+import type ApplicationInstance from '@ember/application/instance';
+import { addIntegration, browserTracingIntegration } from '@sentry/ember';
+
+export function initialize(appInstance: ApplicationInstance): void {
+  addIntegration(browserTracingIntegration({
+    appInstance,
+    minimumRunloopQueueDuration: 0,
+    minimumComponentRenderDuration: 0,
+  }));
+}
+
+export default {
+  initialize,
+};

dev-packages/e2e-tests/test-applications/ember-embroider/config/environment.js

@@ -19,22 +19,7 @@ module.exports = function (environment) {
     },
   };
 
-  ENV['@sentry/ember'] = {
-    sentry: {
-      tracesSampleRate: 1,
-      dsn: process.env.E2E_TEST_DSN,
-      tracePropagationTargets: ['localhost', 'doesntexist.example'],
-      browserTracingOptions: {
-        _experiments: {
-          // This lead to some flaky tests, as that is sometimes logged
-          enableLongTask: false,
-        },
-      },
-    },
-    ignoreEmberOnErrorWarning: true,
-    minimumRunloopQueueDuration: 0,
-    minimumComponentRenderDuration: 0,
-  };
+  ENV.sentryDsn = process.env.E2E_TEST_DSN;
 
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;

dev-packages/e2e-tests/test-applications/ember-vite/.ember-cli

@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": true,
+}

dev-packages/e2e-tests/test-applications/ember-vite/.env.development

@@ -0,0 +1,2 @@
+# This file is committed to git and should not contain any secrets.
+NODE_ENV=development

dev-packages/e2e-tests/test-applications/ember-vite/.gitignore

@@ -0,0 +1,12 @@
+# dependencies
+/node_modules/
+
+# build output
+/dist/
+
+# misc
+/.env*
+!/.env.development
+
+# test results
+/results.junit.xml

dev-packages/e2e-tests/test-applications/ember-vite/.template-lintrc.mjs

@@ -0,0 +1,4 @@
+export default {
+  extends: "recommended",
+  checkHbsTemplateLiterals: false,
+};

dev-packages/e2e-tests/test-applications/ember-vite/.watchmanconfig

@@ -0,0 +1,4 @@
+{
+  "liveReload": false,
+  "watcher": "node"
+}

dev-packages/e2e-tests/test-applications/ember-vite/app/app.ts

@@ -0,0 +1,26 @@
+import Application from '@ember/application';
+import compatModules from '@embroider/virtual/compat-modules';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
+import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
+import * as Sentry from '@sentry/ember';
+
+import config from 'ember-vite/config/environment';
+
+Sentry.init({
+  dsn: config.sentryDsn,
+  tracesSampleRate: 1,
+  replaysSessionSampleRate: 1,
+  replaysOnErrorSampleRate: 1,
+  tracePropagationTargets: ['localhost', 'doesntexist.example'],
+  tunnel: `http://localhost:3031/`, // proxy server
+});
+
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver.withModules(compatModules);
+  inspector = setupInspector(this);
+}
+
+loadInitializers(App, config.modulePrefix, compatModules);

dev-packages/e2e-tests/test-applications/ember-vite/app/components/test-section.gts

@@ -0,0 +1,22 @@
+import { on } from '@ember/modifier';
+
+import type { TOC } from '@ember/component/template-only';
+
+interface TestSectionSignature {
+  Args: {
+    title: string;
+    buttonLabel: string;
+    buttonFunction: () => void;
+  };
+}
+
+const TestSection: TOC<TestSectionSignature> = <template>
+  <div class="section">
+    <h4>{{@title}}</h4>
+    <button type="button" {{on "click" @buttonFunction}} data-test-button={{@title}}>
+      {{@buttonLabel}}
+    </button>
+  </div>
+</template>;
+
+export default TestSection;

dev-packages/e2e-tests/test-applications/ember-vite/app/config/environment.ts

@@ -0,0 +1,19 @@
+import loadConfigFromMeta from '@embroider/config-meta-loader';
+import { assert } from '@ember/debug';
+
+const config = loadConfigFromMeta('ember-vite') as unknown;
+
+assert('config is not an object', typeof config === 'object' && config !== null);
+assert('modulePrefix was not detected on your config', 'modulePrefix' in config && typeof config.modulePrefix === 'string');
+assert('locationType was not detected on your config', 'locationType' in config && typeof config.locationType === 'string');
+assert('rootURL was not detected on your config', 'rootURL' in config && typeof config.rootURL === 'string');
+assert('APP was not detected on your config', 'APP' in config && typeof config.APP === 'object');
+
+export default config as {
+  modulePrefix: string;
+  podModulePrefix?: string;
+  locationType: string;
+  rootURL: string;
+  sentryDsn: string;
+  APP: Record<string, unknown>;
+} & Record<string, unknown>;

dev-packages/e2e-tests/test-applications/ember-vite/app/instance-initializers/sentry-performance.ts

@@ -0,0 +1,14 @@
+import type ApplicationInstance from '@ember/application/instance';
+import { addIntegration, browserTracingIntegration } from '@sentry/ember';
+
+export function initialize(appInstance: ApplicationInstance): void {
+  addIntegration(browserTracingIntegration({
+    appInstance,
+    minimumRunloopQueueDuration: 0,
+    minimumComponentRenderDuration: 0,
+  }));
+}
+
+export default {
+  initialize,
+};

dev-packages/e2e-tests/test-applications/ember-vite/app/router.ts

@@ -0,0 +1,15 @@
+import EmberRouter from '@embroider/router';
+import config from 'ember-vite/config/environment';
+
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
+
+Router.map(function () {
+  this.route('tracing');
+  this.route('replay');
+  this.route('slow-loading-route', function () {
+    this.route('index', { path: '/' });
+  });
+});

packages/ember/tests/dummy/app/routes/replay.ts → dev-packages/e2e-tests/test-applications/ember-vite/app/routes/replay.ts

@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
 import * as Sentry from '@sentry/ember';
 
 export default class ReplayRoute extends Route {
-  public async beforeModel(): Promise<void> {
+  async beforeModel(): Promise<void> {
     const { replayIntegration } = Sentry;
     const client = Sentry.getClient();
     if (client && !client.getIntegrationByName('Replay')) {

packages/ember/tests/dummy/app/routes/slow-loading-route.ts → dev-packages/e2e-tests/test-applications/ember-vite/app/routes/slow-loading-route.ts

@@ -1,23 +1,24 @@
 import Route from '@ember/routing/route';
 import { instrumentRoutePerformance } from '@sentry/ember';
+
 import timeout from '../helpers/utils';
 
 const SLOW_TRANSITION_WAIT = 1500;
 
 class SlowDefaultLoadingRoute extends Route {
-  public beforeModel(): Promise<void> {
+  beforeModel(): Promise<void> {
     return timeout(SLOW_TRANSITION_WAIT / 3);
   }
 
-  public model(): Promise<void> {
+  model(): Promise<void> {
     return timeout(SLOW_TRANSITION_WAIT / 3);
   }
 
-  public afterModel(): Promise<void> {
+  afterModel(): Promise<void> {
     return timeout(SLOW_TRANSITION_WAIT / 3);
   }
 
-  public setupController(...rest: Parameters<Route['setupController']>): ReturnType<Route['setupController']> {
+  setupController(...rest: Parameters<Route['setupController']>): ReturnType<Route['setupController']> {
     super.setupController(...rest);
   }
 }

packages/ember/tests/dummy/app/routes/slow-loading-route/index.ts → dev-packages/e2e-tests/test-applications/ember-vite/app/routes/slow-loading-route/index.ts

@@ -1,23 +1,24 @@
 import Route from '@ember/routing/route';
 import { instrumentRoutePerformance } from '@sentry/ember';
+
 import timeout from '../../helpers/utils';
 
 const SLOW_TRANSITION_WAIT = 1500;
 
 class SlowLoadingRoute extends Route {
-  public beforeModel(): Promise<void> {
+  beforeModel(): Promise<void> {
     return timeout(SLOW_TRANSITION_WAIT / 3);
   }
 
-  public model(): Promise<void> {
+  model(): Promise<void> {
     return timeout(SLOW_TRANSITION_WAIT / 3);
   }
 
-  public afterModel(): Promise<void> {
+  afterModel(): Promise<void> {
     return timeout(SLOW_TRANSITION_WAIT / 3);
   }
 
-  public setupController(...rest: Parameters<Route['setupController']>): ReturnType<Route['setupController']> {
+  setupController(...rest: Parameters<Route['setupController']>): ReturnType<Route['setupController']> {
     super.setupController(...rest);
   }
 }

dev-packages/e2e-tests/test-applications/ember-vite/app/templates/application.gts

@@ -0,0 +1,20 @@
+import { pageTitle } from 'ember-page-title';
+import { LinkTo } from '@ember/routing';
+
+<template>
+  {{pageTitle "Ember Vite"}}
+
+  <div class="app">
+    <h1>Sentry Ember Vite E2E Test</h1>
+    <nav>
+      <LinkTo @route="index">Errors</LinkTo>
+      |
+      <LinkTo @route="tracing">Tracing</LinkTo>
+      |
+      <LinkTo @route="replay">Replay</LinkTo>
+    </nav>
+    <main>
+      {{outlet}}
+    </main>
+  </div>
+</template>

dev-packages/e2e-tests/test-applications/ember-vite/app/templates/index.gts

@@ -0,0 +1,20 @@
+import TestSection from 'ember-vite/components/test-section';
+
+function createError(): void {
+  const obj: Record<string, unknown> = {};
+  (obj as { nonExistentFunction: () => void }).nonExistentFunction();
+}
+
+function createEmberError(): void {
+  throw new Error('Whoops, looks like you have an EmberError');
+}
+
+function createFetchError(): void {
+  void fetch('http://doesntexist.example');
+}
+
+<template>
+  <TestSection @title="Throw Generic Javascript Error" @buttonLabel="Break Things!" @buttonFunction={{createError}} />
+  <TestSection @title="Throw EmberError" @buttonLabel="Break Things!" @buttonFunction={{createEmberError}} />
+  <TestSection @title="Error From Fetch" @buttonLabel="Break Things!" @buttonFunction={{createFetchError}} />
+</template>

dev-packages/e2e-tests/test-applications/ember-vite/app/templates/replay.gts

@@ -0,0 +1,3 @@
+<template>
+  <h2>Visiting this page starts Replay!</h2>
+</template>

dev-packages/e2e-tests/test-applications/ember-vite/app/templates/slow-loading-route.gts

@@ -0,0 +1,4 @@
+<template>
+  <h3>Intentionally Slow Route</h3>
+  {{outlet}}
+</template>

dev-packages/e2e-tests/test-applications/ember-vite/app/templates/slow-loading-route/index.gts

@@ -0,0 +1,3 @@
+<template>
+  <p>Slow loading route loaded.</p>
+</template>

dev-packages/e2e-tests/test-applications/ember-vite/app/templates/tracing.gts

@@ -0,0 +1,8 @@
+import { LinkTo } from '@ember/routing';
+
+<template>
+  <h2>Tracing</h2>
+  <LinkTo @route="slow-loading-route" data-test-button="Transition to slow loading route">
+    Transition to slow loading route
+  </LinkTo>
+</template>